summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm63xx/boards
diff options
context:
space:
mode:
authorMaxime Bizon <mbizon@freebox.fr>2009-09-28 14:49:43 +0200
committerRalf Baechle <ralf@linux-mips.org>2009-09-30 21:47:01 +0200
commit553d6d5f5b84f11fad8043688137dac96df1a06d (patch)
tree39613a02feb6617d619c84045d3c41e479a566b5 /arch/mips/bcm63xx/boards
parentMIPS: MSP71xx: request_irq() failure ignored in msp_pcibios_config_access() (diff)
downloadlinux-553d6d5f5b84f11fad8043688137dac96df1a06d.tar.xz
linux-553d6d5f5b84f11fad8043688137dac96df1a06d.zip
MIPS: BCM63xx: Add PCMCIA & Cardbus support.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr> Reviewed-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/bcm63xx/boards')
-rw-r--r--arch/mips/bcm63xx/boards/board_bcm963xx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 5a327f3a7167..78e155d21be6 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -23,6 +23,7 @@
#include <bcm63xx_dev_pci.h>
#include <bcm63xx_dev_enet.h>
#include <bcm63xx_dev_dsp.h>
+#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_uart.h>
#include <board_bcm963xx.h>
@@ -795,6 +796,9 @@ int __init board_register_devices(void)
bcm63xx_uart_register();
+ if (board.has_pccard)
+ bcm63xx_pcmcia_register();
+
if (board.has_enet0 &&
!board_get_mac_address(board.enet0.mac_addr))
bcm63xx_enet_register(0, &board.enet0);