diff options
| author | Andi Kleen <ak@suse.de> | 2005-04-16 15:24:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:56 -0700 |
| commit | b6d9a5d81c6159ad651b5c6bb9223d14e33d8033 (patch) | |
| tree | 68c06cad51517a312ba720f37610f8380f084efd | |
| parent | 1e01441051dda3bb01c455b6e20bce6d00563d82 (diff) | |
| download | linux-b6d9a5d81c6159ad651b5c6bb9223d14e33d8033.tar.gz | |
[PATCH] x86_64: Make IRDA devices are not really ISA devices not depend on CONFIG_ISA
This allows to use them on x86-64
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/net/irda/Kconfig | 10 | ||||
| -rw-r--r-- | include/net/irda/irda_device.h | 2 | ||||
| -rw-r--r-- | net/irda/irda_device.c | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index a464841da49fd0..6bf76a444d483a 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -310,7 +310,7 @@ config SIGMATEL_FIR config NSC_FIR tristate "NSC PC87108/PC87338" - depends on IRDA && ISA + depends on IRDA help Say Y here if you want to build support for the NSC PC87108 and PC87338 IrDA chipsets. This driver supports SIR, @@ -321,7 +321,7 @@ config NSC_FIR config WINBOND_FIR tristate "Winbond W83977AF (IR)" - depends on IRDA && ISA + depends on IRDA help Say Y here if you want to build IrDA support for the Winbond W83977AF super-io chipset. This driver should be used for the IrDA @@ -347,7 +347,7 @@ config AU1000_FIR config SMC_IRCC_FIR tristate "SMSC IrCC (EXPERIMENTAL)" - depends on EXPERIMENTAL && IRDA && ISA + depends on EXPERIMENTAL && IRDA help Say Y here if you want to build support for the SMC Infrared Communications Controller. It is used in a wide variety of @@ -357,7 +357,7 @@ config SMC_IRCC_FIR config ALI_FIR tristate "ALi M5123 FIR (EXPERIMENTAL)" - depends on EXPERIMENTAL && IRDA && ISA + depends on EXPERIMENTAL && IRDA help Say Y here if you want to build support for the ALi M5123 FIR Controller. The ALi M5123 FIR Controller is embedded in ALi M1543C, @@ -385,7 +385,7 @@ config SA1100_FIR config VIA_FIR tristate "VIA VT8231/VT1211 SIR/MIR/FIR" - depends on IRDA && ISA && PCI + depends on IRDA help Say Y here if you want to build support for the VIA VT8231 and VIA VT1211 IrDA controllers, found on the motherboards using diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h index 3b216f186f183c..71d6af83b63170 100644 --- a/include/net/irda/irda_device.h +++ b/include/net/irda/irda_device.h @@ -235,9 +235,7 @@ int irda_device_register_dongle(struct dongle_reg *dongle); dongle_t *irda_device_dongle_init(struct net_device *dev, int type); int irda_device_dongle_cleanup(dongle_t *dongle); -#ifdef CONFIG_ISA void irda_setup_dma(int channel, dma_addr_t buffer, int count, int mode); -#endif void irda_task_delete(struct irda_task *task); struct irda_task *irda_task_execute(void *instance, diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index 9b9bb003c5a9f8..d6ccd3239dcf5e 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c @@ -470,11 +470,10 @@ void irda_device_unregister_dongle(struct dongle_reg *dongle) } EXPORT_SYMBOL(irda_device_unregister_dongle); -#ifdef CONFIG_ISA /* * Function setup_dma (idev, buffer, count, mode) * - * Setup the DMA channel. Commonly used by ISA FIR drivers + * Setup the DMA channel. Commonly used by LPC FIR drivers * */ void irda_setup_dma(int channel, dma_addr_t buffer, int count, int mode) @@ -493,4 +492,3 @@ void irda_setup_dma(int channel, dma_addr_t buffer, int count, int mode) release_dma_lock(flags); } EXPORT_SYMBOL(irda_setup_dma); -#endif |