]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
pcmcia: pxa2xx: fix logic for lubbock
authorArnd Bergmann <arnd@arndb.de>
Thu, 5 Jun 2014 21:05:48 +0000 (23:05 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 19 Nov 2014 22:27:30 +0000 (23:27 +0100)
commit2948ce57731969aa662e0192d2df0749f1f21462
tree5495ec9a4255737faa682667d7b3c3b0d55f5c71
parent77cf7a125c16bfab995ea37962047a80d296bad7
pcmcia: pxa2xx: fix logic for lubbock

commit f1674f213ec81c55c909bb6805d3502b5883754d upstream.

The lubbock platform uses the sa1111 companion chip with a pxa250
CPU, which means it requires both the PCMCIA_SA1111 and the
PCMCIA_PXA2XX code to be built into the kernel. Unfortunately,
the Makefile and Kconfig don't agree on how this is accomplished,
leading to a situation where you get this link error when building
a lubbock kernel with PCMCIA_SA1111 enabled but PCMCIA_PXA2XX
disabled:

ERROR: "pxa2xx_configure_sockets" [drivers/pcmcia/sa1111_cs.ko] undefined!
ERROR: "pxa2xx_drv_pcmcia_ops" [drivers/pcmcia/sa1111_cs.ko] undefined!
ERROR: "pxa2xx_drv_pcmcia_add_one" [drivers/pcmcia/sa1111_cs.ko] undefined!

This patch changes the Kconfig code to disallow that particular
configuration.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/pcmcia/Kconfig