Commit 58556e5f authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] Fix MCA_LEGACY dependencies

The patch below against 2.6.7-mm5 fixes more compile errors with
MCA_LEGACY=n.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAdrian Bunk <bunk@fs.tum.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d1718e93
...@@ -666,7 +666,7 @@ config 3C515 ...@@ -666,7 +666,7 @@ config 3C515
config ELMC config ELMC
tristate "3c523 \"EtherLink/MC\" support" tristate "3c523 \"EtherLink/MC\" support"
depends on NET_VENDOR_3COM && MCA depends on NET_VENDOR_3COM && MCA_LEGACY
help help
If you have a network (Ethernet) card of this type, say Y and read If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from the Ethernet-HOWTO, available from
......
...@@ -89,7 +89,7 @@ static unsigned at1700_probe_list[] __initdata = { ...@@ -89,7 +89,7 @@ static unsigned at1700_probe_list[] __initdata = {
/* /*
* MCA * MCA
*/ */
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
static int at1700_ioaddr_pattern[] __initdata = { static int at1700_ioaddr_pattern[] __initdata = {
0x00, 0x04, 0x01, 0x05, 0x02, 0x06, 0x03, 0x07 0x00, 0x04, 0x01, 0x05, 0x02, 0x06, 0x03, 0x07
}; };
...@@ -174,7 +174,7 @@ static void set_rx_mode(struct net_device *dev); ...@@ -174,7 +174,7 @@ static void set_rx_mode(struct net_device *dev);
static void net_tx_timeout (struct net_device *dev); static void net_tx_timeout (struct net_device *dev);
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
struct at1720_mca_adapters_struct { struct at1720_mca_adapters_struct {
char* name; char* name;
int id; int id;
...@@ -202,7 +202,7 @@ static int irq; ...@@ -202,7 +202,7 @@ static int irq;
static void cleanup_card(struct net_device *dev) static void cleanup_card(struct net_device *dev)
{ {
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
struct net_local *lp = netdev_priv(dev); struct net_local *lp = netdev_priv(dev);
if (lp->mca_slot >= 0) if (lp->mca_slot >= 0)
mca_mark_as_unused(lp->mca_slot); mca_mark_as_unused(lp->mca_slot);
...@@ -288,7 +288,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) ...@@ -288,7 +288,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
read_eeprom(ioaddr, 6), inw(ioaddr + EEPROM_Ctrl)); read_eeprom(ioaddr, 6), inw(ioaddr + EEPROM_Ctrl));
#endif #endif
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
/* rEnE (rene@bss.lu): got this from 3c509 driver source , adapted for AT1720 */ /* rEnE (rene@bss.lu): got this from 3c509 driver source , adapted for AT1720 */
/* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch, heavily /* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch, heavily
...@@ -359,7 +359,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) ...@@ -359,7 +359,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
goto err_out; goto err_out;
} }
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
found: found:
#endif #endif
...@@ -483,7 +483,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) ...@@ -483,7 +483,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
return 0; return 0;
err_mca: err_mca:
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
if (slot >= 0) if (slot >= 0)
mca_mark_as_unused(slot); mca_mark_as_unused(slot);
#endif #endif
......
...@@ -230,7 +230,7 @@ static unsigned short start_code[] = { ...@@ -230,7 +230,7 @@ static unsigned short start_code[] = {
/* maps irq number to EtherExpress magic value */ /* maps irq number to EtherExpress magic value */
static char irqrmap[] = { 0,0,1,2,3,4,0,0,0,1,5,6,0,0,0,0 }; static char irqrmap[] = { 0,0,1,2,3,4,0,0,0,1,5,6,0,0,0,0 };
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
/* mapping of the first four bits of the second POS register */ /* mapping of the first four bits of the second POS register */
static unsigned short mca_iomap[] = { static unsigned short mca_iomap[] = {
0x270, 0x260, 0x250, 0x240, 0x230, 0x220, 0x210, 0x200, 0x270, 0x260, 0x250, 0x240, 0x230, 0x220, 0x210, 0x200,
...@@ -345,7 +345,7 @@ static int __init do_express_probe(struct net_device *dev) ...@@ -345,7 +345,7 @@ static int __init do_express_probe(struct net_device *dev)
dev->if_port = 0xff; /* not set */ dev->if_port = 0xff; /* not set */
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
if (MCA_bus) { if (MCA_bus) {
int slot = 0; int slot = 0;
......
...@@ -157,7 +157,7 @@ config ABYSS ...@@ -157,7 +157,7 @@ config ABYSS
config MADGEMC config MADGEMC
tristate "Madge Smart 16/4 Ringnode MicroChannel" tristate "Madge Smart 16/4 Ringnode MicroChannel"
depends on TR && TMS380TR && MCA depends on TR && TMS380TR && MCA_LEGACY
help help
This tms380 module supports the Madge Smart 16/4 MC16 and MC32 This tms380 module supports the Madge Smart 16/4 MC16 and MC32
MicroChannel adapters. MicroChannel adapters.
...@@ -167,7 +167,7 @@ config MADGEMC ...@@ -167,7 +167,7 @@ config MADGEMC
config SMCTR config SMCTR
tristate "SMC ISA/MCA adapter support" tristate "SMC ISA/MCA adapter support"
depends on TR && (ISA || MCA) depends on TR && (ISA || MCA_LEGACY)
---help--- ---help---
This is support for the ISA and MCA SMC Token Ring cards, This is support for the ISA and MCA SMC Token Ring cards,
specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
......
...@@ -69,7 +69,7 @@ static const char cardname[] = "smctr"; ...@@ -69,7 +69,7 @@ static const char cardname[] = "smctr";
#define SMCTR_IO_EXTENT 20 #define SMCTR_IO_EXTENT 20
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
static unsigned int smctr_posid = 0x6ec6; static unsigned int smctr_posid = 0x6ec6;
#endif #endif
...@@ -479,7 +479,7 @@ static int smctr_checksum_firmware(struct net_device *dev) ...@@ -479,7 +479,7 @@ static int smctr_checksum_firmware(struct net_device *dev)
static int __init smctr_chk_mca(struct net_device *dev) static int __init smctr_chk_mca(struct net_device *dev)
{ {
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
struct net_local *tp = netdev_priv(dev); struct net_local *tp = netdev_priv(dev);
int current_slot; int current_slot;
__u8 r1, r2, r3, r4, r5; __u8 r1, r2, r3, r4, r5;
...@@ -626,7 +626,7 @@ static int __init smctr_chk_mca(struct net_device *dev) ...@@ -626,7 +626,7 @@ static int __init smctr_chk_mca(struct net_device *dev)
return (0); return (0);
#else #else
return (-1); return (-1);
#endif /* CONFIG_MCA */ #endif /* CONFIG_MCA_LEGACY */
} }
static int smctr_chg_rx_mask(struct net_device *dev) static int smctr_chg_rx_mask(struct net_device *dev)
...@@ -3617,7 +3617,7 @@ struct net_device __init *smctr_probe(int unit) ...@@ -3617,7 +3617,7 @@ struct net_device __init *smctr_probe(int unit)
goto out1; goto out1;
return dev; return dev;
out1: out1:
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
{ struct net_local *tp = netdev_priv(dev); { struct net_local *tp = netdev_priv(dev);
if (tp->slot_num) if (tp->slot_num)
mca_mark_as_unused(tp->slot_num); mca_mark_as_unused(tp->slot_num);
...@@ -5685,7 +5685,7 @@ static struct net_device *setup_card(int n) ...@@ -5685,7 +5685,7 @@ static struct net_device *setup_card(int n)
goto out1; goto out1;
return dev; return dev;
out1: out1:
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
{ struct net_local *tp = netdev_priv(dev); { struct net_local *tp = netdev_priv(dev);
if (tp->slot_num) if (tp->slot_num)
mca_mark_as_unused(tp->slot_num); mca_mark_as_unused(tp->slot_num);
...@@ -5725,7 +5725,7 @@ void cleanup_module(void) ...@@ -5725,7 +5725,7 @@ void cleanup_module(void)
if (dev) { if (dev) {
unregister_netdev(dev); unregister_netdev(dev);
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
{ struct net_local *tp = netdev_priv(dev); { struct net_local *tp = netdev_priv(dev);
if (tp->slot_num) if (tp->slot_num)
mca_mark_as_unused(tp->slot_num); mca_mark_as_unused(tp->slot_num);
......
...@@ -628,7 +628,7 @@ config SCSI_FUTURE_DOMAIN ...@@ -628,7 +628,7 @@ config SCSI_FUTURE_DOMAIN
config SCSI_FD_MCS config SCSI_FD_MCS
tristate "Future Domain MCS-600/700 SCSI support" tristate "Future Domain MCS-600/700 SCSI support"
depends on MCA && SCSI depends on MCA_LEGACY && SCSI
---help--- ---help---
This is support for Future Domain MCS 600/700 MCA SCSI adapters. This is support for Future Domain MCS 600/700 MCA SCSI adapters.
Some PS/2 computers are equipped with IBM Fast SCSI Adapter/A which Some PS/2 computers are equipped with IBM Fast SCSI Adapter/A which
...@@ -699,7 +699,7 @@ config SCSI_GENERIC_NCR53C400 ...@@ -699,7 +699,7 @@ config SCSI_GENERIC_NCR53C400
config SCSI_IBMMCA config SCSI_IBMMCA
tristate "IBMMCA SCSI support" tristate "IBMMCA SCSI support"
depends on MCA && SCSI depends on MCA_LEGACY && SCSI
---help--- ---help---
This is support for the IBM SCSI adapter found in many of the PS/2 This is support for the IBM SCSI adapter found in many of the PS/2
series computers. These machines have an MCA bus, so you need to series computers. These machines have an MCA bus, so you need to
......
...@@ -1069,7 +1069,7 @@ static int __init aha1542_detect(Scsi_Host_Template * tpnt) ...@@ -1069,7 +1069,7 @@ static int __init aha1542_detect(Scsi_Host_Template * tpnt)
/* /*
* Find MicroChannel cards (AHA1640) * Find MicroChannel cards (AHA1640)
*/ */
#ifdef CONFIG_MCA #ifdef CONFIG_MCA_LEGACY
if(MCA_bus) { if(MCA_bus) {
int slot = 0; int slot = 0;
int pos = 0; int pos = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment