diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /drivers/net/irda | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/Makefile | 14 | ||||
| -rw-r--r-- | drivers/net/irda/smc-ircc.c | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile index f923bf012..976f1c101 100644 --- a/drivers/net/irda/Makefile +++ b/drivers/net/irda/Makefile @@ -5,10 +5,6 @@ # Rewritten to use lists instead of if-statements. # -SUB_DIRS := -MOD_SUB_DIRS := $(SUB_DIRS) -ALL_SUB_DIRS := $(SUB_DIRS) - O_TARGET := irda.o export-objs = irport.o @@ -27,14 +23,4 @@ obj-$(CONFIG_GIRBIL_DONGLE) += girbil.o obj-$(CONFIG_LITELINK_DONGLE) += litelink.o obj-$(CONFIG_OLD_BELKIN_DONGLE) += old_belkin.o - -# Files that are both resident and modular: remove from modular. -obj-m := $(filter-out $(obj-y), $(obj-m)) - -# Translate to Rules.make lists. -O_OBJS := $(filter-out $(export-objs), $(obj-y)) -OX_OBJS := $(filter $(export-objs), $(obj-y)) -M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m))) -MX_OBJS := $(sort $(filter $(export-objs), $(obj-m))) - include $(TOPDIR)/Rules.make diff --git a/drivers/net/irda/smc-ircc.c b/drivers/net/irda/smc-ircc.c index 480796f75..358ee18be 100644 --- a/drivers/net/irda/smc-ircc.c +++ b/drivers/net/irda/smc-ircc.c @@ -95,6 +95,7 @@ static int ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data); static smc_chip_t chips[] = { { "FDC37C669", 0x55, 0x55, 0x0d, 0x04, ircc_probe_69 }, + { "FDC37N769", 0x55, 0x55, 0x0d, 0x28, ircc_probe_69 }, { "FDC37N869", 0x55, 0x00, 0x0d, 0x29, ircc_probe_69 }, { "FDC37N958", 0x55, 0x55, 0x20, 0x09, ircc_probe_58 }, { NULL } |