tree 68c06cad51517a312ba720f37610f8380f084efd
parent 1e01441051dda3bb01c455b6e20bce6d00563d82
author Andi Kleen <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:56 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:56 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
net/irda/Kconfig | 10 +++++-----
net/irda/irda_device.h | 2 --
irda/irda_device.c | 4 +---
3 files changed, 6 insertions(+), 10 deletions(-)
Index: drivers/net/irda/Kconfig
===================================================================
--- 5dc4c69dd4522ca569f70ead0ecbb923f1451891/drivers/net/irda/Kconfig
(mode:100644 sha1:a464841da49fd07c57dca95ed9d14793c8b2374a)
+++ 68c06cad51517a312ba720f37610f8380f084efd/drivers/net/irda/Kconfig
(mode:100644 sha1:6bf76a444d483a375dede2ba44b04a952d79ed2b)
@@ -310,7 +310,7 @@
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 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 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 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 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
Index: include/net/irda/irda_device.h
===================================================================
--- 5dc4c69dd4522ca569f70ead0ecbb923f1451891/include/net/irda/irda_device.h
(mode:100644 sha1:3b216f186f183c3bd3fb656bef69e9a0c0651346)
+++ 68c06cad51517a312ba720f37610f8380f084efd/include/net/irda/irda_device.h
(mode:100644 sha1:71d6af83b631702d3053e77814ea0b2eec250f29)
@@ -235,9 +235,7 @@
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,
Index: net/irda/irda_device.c
===================================================================
--- 5dc4c69dd4522ca569f70ead0ecbb923f1451891/net/irda/irda_device.c
(mode:100644 sha1:9b9bb003c5a9f8c49599151202a13db7396b5493)
+++ 68c06cad51517a312ba720f37610f8380f084efd/net/irda/irda_device.c
(mode:100644 sha1:d6ccd3239dcf5efa25c8c86906062032de8740f7)
@@ -470,11 +470,10 @@
}
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 @@
release_dma_lock(flags);
}
EXPORT_SYMBOL(irda_setup_dma);
-#endif
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
