PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

skt->irq is a mere duplication of pcmcia_socket's pci_irq member.
Get rid of it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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