Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df4bb4a authored by Russell King's avatar Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents cd6e125c 91a86a96

arch/arm/mach-mmp/ttc_dkb.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


#include "common.h"



#define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)



static unsigned long ttc_dkb_pin_config[] __initdata = {

	/* UART2 */

	GPIO47_UART2_RXD,

arch/arm/mach-pxa/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ config MACH_ZYLONITE320 
config MACH_LITTLETON

	bool "PXA3xx Form Factor Platform (aka Littleton)"

	select PXA3xx

	select CPU_PXA300

	select CPU_PXA310

	select PXA_SSP



config MACH_TAVOREVB

arch/arm/mach-pxa/include/mach/zylonite.h

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
/* the following variables are processor specific and initialized

 * by the corresponding zylonite_pxa3xx_init()

 */

struct platform_mmc_slot {

	int gpio_cd;

	int gpio_wp;

};



extern struct platform_mmc_slot zylonite_mmc_slot[];



extern int gpio_eth_irq;

extern int gpio_debug_led1;

extern int gpio_debug_led2;

arch/arm/mach-pxa/littleton.c

+6 −0
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ static mfp_cfg_t littleton_mfp_cfg[] __initdata = { 
	GPIO7_MMC1_CLK,

	GPIO8_MMC1_CMD,

	GPIO15_GPIO, /* card detect */



	/* UART3 */

	GPIO107_UART3_CTS,

	GPIO108_UART3_RTS,

	GPIO109_UART3_TXD,

	GPIO110_UART3_RXD,

};



static struct resource smc91x_resources[] = {

arch/arm/mach-pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static struct pxamci_platform_data poodle_mci_platform_data = { 
	.init 			= poodle_mci_init,

	.setpower 		= poodle_mci_setpower,

	.exit			= poodle_mci_exit,

	.gpio_card_detect	= POODLE_IRQ_GPIO_nSD_DETECT,

	.gpio_card_detect	= POODLE_GPIO_nSD_DETECT,

	.gpio_card_ro		= POODLE_GPIO_nSD_WP,

	.gpio_power		= -1,

};