tree e1a8807a9ce5545cd1a0f27467d8a225b499de2a
parent afbb63d4f706d1dfe934f118768c7b81f27196a0
author Andi Kleen <[EMAIL PROTECTED]> Tue Apr 12 08:25:27 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:27 2005
[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]>
drivers/net/irda/Kconfig | 10 +++++-----
include/net/irda/irda_device.h | 2 --
net/irda/irda_device.c | 4 +---
3 files changed, 6 insertions(+), 10 deletions(-)
Index: drivers/net/irda/Kconfig
===================================================================
--- 0ca134382c1e71c0afed34d7592b4e8dff713054/drivers/net/irda/Kconfig
(mode:100644 sha1:9c7ace1af5610a236b38d986864b15d8e3e3f176)
+++ e1a8807a9ce5545cd1a0f27467d8a225b499de2a/drivers/net/irda/Kconfig
(mode:100644 sha1:134eb57ac298597faa6ff48867fa454ff6dce8de)
@@ -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
===================================================================
--- 0ca134382c1e71c0afed34d7592b4e8dff713054/include/net/irda/irda_device.h
(mode:100644 sha1:36118b5ce3ee353f91fdecb933d6017b10eabc29)
+++ e1a8807a9ce5545cd1a0f27467d8a225b499de2a/include/net/irda/irda_device.h
(mode:100644 sha1:6548bf6c05b5b7ad2f74648fcc273173f877f868)
@@ -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
===================================================================
--- 0ca134382c1e71c0afed34d7592b4e8dff713054/net/irda/irda_device.c
(mode:100644 sha1:0dd0d6ccb3b5365dd4bcbc0c92d9d8a3b319628a)
+++ e1a8807a9ce5545cd1a0f27467d8a225b499de2a/net/irda/irda_device.c
(mode:100644 sha1:917e04140edc29a4130e9ec54d52352e30881e46)
@@ -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
