Commit b6d9a5d8 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1e014410

drivers/net/irda/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -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

include/net/irda/irda_device.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

net/irda/irda_device.c

+1 −3
Original line number Diff line number Diff line
@@ -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