Browse Source

Fix soc_common PCMCIA configuration

Jonathan Cameron reports that building PCMCIA as modules doesn't work:

As module get a load of undefined symbols:
ERROR: "soc_pcmcia_request_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined!
ERROR: "soc_pcmcia_free_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined!
ERROR: "soc_pcmcia_enable_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined!
ERROR: "soc_pcmcia_disable_irqs" [drivers/pcmcia/pxa2xx_stargate2.ko] undefined!
ERROR: "soc_pcmcia_add_one" [drivers/pcmcia/pxa2xx_base.ko] undefined!
ERROR: "soc_common_pcmcia_get_timing" [drivers/pcmcia/pxa2xx_base.ko] undefined!
ERROR: "soc_pcmcia_remove_one" [drivers/pcmcia/pxa2xx_base.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

This is because soc_common tries to be built-in, but it should be a module.
Allow soc_common to be a module.

Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 15 năm trước cách đây
mục cha
commit
1bf8e62195
1 tập tin đã thay đổi với 1 bổ sung1 xóa
  1. 1 1
      drivers/pcmcia/Kconfig

+ 1 - 1
drivers/pcmcia/Kconfig

@@ -179,7 +179,7 @@ config PCMCIA_BCM63XX
 	depends on BCM63XX && PCMCIA
 	depends on BCM63XX && PCMCIA
 
 
 config PCMCIA_SOC_COMMON
 config PCMCIA_SOC_COMMON
-	bool
+	tristate
 
 
 config PCMCIA_SA1100
 config PCMCIA_SA1100
 	tristate "SA1100 support"
 	tristate "SA1100 support"