pcmcia vs. MECR on pxa25x/sa1111

After 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by
sa1111_pcmcia_add(). That unfortunately means that configure_sockets()
is not called, leading to MECR not being set properly, leading to
strange crashes.

Tested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps
cleaner solution exists?

Signed-off-by: Pavel Machek <pma@sysgo.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

diff --cc drivers/pcmcia/pxa2xx_base.c
Simple merge

diff --cc drivers/pcmcia/pxa2xx_base.h
Simple merge

diff --cc drivers/pcmcia/pxa2xx_lubbock.c
Simple merge