aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Space.c
diff options
context:
space:
mode:
authorJaccon Bastiaansen <jaccon.bastiaansen@gmail.com>2012-01-26 21:46:15 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-01 16:49:50 +0100
commite9460a9e811dddd9ea1ae9838d9b53bfaf78cd2c (patch)
tree016ab829cf8c7cf76c117d82232a78eba1b64c01 /drivers/net/Space.c
parentLinux 3.3-rc2 (diff)
downloadlinux-dev-e9460a9e811dddd9ea1ae9838d9b53bfaf78cd2c.tar.xz
linux-dev-e9460a9e811dddd9ea1ae9838d9b53bfaf78cd2c.zip
CS89x0 : add platform driver support
The CS89x0 ethernet controller is used on a number of evaluation boards, such as the MX31ADS. The current driver has memory address and IRQ settings for each board on which this controller is used. Driver updates are therefore required to support other boards that also use the CS89x0. To avoid these driver updates, a better mechanism (platform driver support) is added to communicate the board dependent settings to the driver. Signed-off-by: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r--drivers/net/Space.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 068c3563e00f..88bbd8ffa7fe 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -190,8 +190,10 @@ static struct devprobe2 isa_probes[] __initdata = {
{seeq8005_probe, 0},
#endif
#ifdef CONFIG_CS89x0
+#ifndef CONFIG_CS89x0_PLATFORM
{cs89x0_probe, 0},
#endif
+#endif
#ifdef CONFIG_AT1700
{at1700_probe, 0},
#endif