Commit dc52b5bf authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
parents 542f869f d66ea8d4

arch/arm/mach-pxa/colibri-pxa300.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void __init colibri_pxa300_init(void) 
	colibri_pxa300_init_eth();

	colibri_pxa300_init_ohci();

	colibri_pxa300_init_lcd();

	colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO));

	colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO));

	colibri_pxa310_init_ac97();

	colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config),

				mfp_to_gpio(MFP_PIN_GPIO13));

arch/arm/mach-pxa/colibri-pxa320.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ void __init colibri_pxa320_init(void) 
	colibri_pxa320_init_eth();

	colibri_pxa320_init_ohci();

	colibri_pxa320_init_lcd();

	colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO));

	colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO));

	colibri_pxa320_init_ac97();

	colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config),

				mfp_to_gpio(MFP_PIN_GPIO28));

arch/arm/plat-pxa/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Makefile for code common across different PXA processor families

#



obj-y	:= dma.o mfp.o

obj-y	:= dma.o



obj-$(CONFIG_GENERIC_GPIO)	+= gpio.o

obj-$(CONFIG_PXA3xx)		+= mfp.o

obj-$(CONFIG_ARCH_MMP)		+= mfp.o

drivers/pcmcia/pxa2xx_base.c

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void pxa2xx_configure_sockets(struct device *dev) 
	MECR |= MECR_CIT;



	/* Set MECR:NOS (Number Of Sockets) */

	if (ops->nr > 1 || machine_is_viper())

	if ((ops->first + ops->nr) > 1 || machine_is_viper())

		MECR |= MECR_NOS;

	else

		MECR &= ~MECR_NOS;
@@ -250,7 +250,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) 
	for (i = 0; i < ops->nr; i++) {

		skt = &sinfo->skt[i];



		skt->nr		= i;

		skt->nr		= ops->first + i;

		skt->irq	= NO_IRQ;



		skt->res_skt.start	= _PCMCIA(skt->nr);

drivers/pcmcia/pxa2xx_palmld.c

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) 
static struct pcmcia_low_level palmld_pcmcia_ops = {

	.owner			= THIS_MODULE,



	.first			= 0,

	.nr			= 2,

	.first			= 1,

	.nr			= 1,



	.hw_init		= palmld_pcmcia_hw_init,

	.hw_shutdown		= palmld_pcmcia_hw_shutdown,