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

Commit 9fa264d0 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents 0882e8dd 6845a658

arch/arm/mach-pxa/em-x270.c

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/spi/libertas_spi.h>

#include <linux/power_supply.h>

#include <linux/apm-emulation.h>

#include <linux/delay.h>



#include <media/soc_camera.h>
@@ -646,6 +645,7 @@ static struct pxa2xx_spi_master em_x270_spi_info = { 
static struct pxa2xx_spi_chip em_x270_tdo24m_chip = {

	.rx_threshold	= 1,

	.tx_threshold	= 1,

	.gpio_cs	= -1,

};



static struct tdo24m_platform_data em_x270_tdo24m_pdata = {

arch/arm/mach-pxa/generic.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ extern struct sys_timer pxa_timer; 
extern void __init pxa_init_irq(int irq_nr,

				int (*set_wake)(unsigned int, unsigned int));

extern void __init pxa25x_init_irq(void);

#ifdef CONFIG_CPU_PXA26x

extern void __init pxa26x_init_irq(void);

#endif

extern void __init pxa27x_init_irq(void);

extern void __init pxa3xx_init_irq(void);

extern void __init pxa_map_io(void);

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

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
#if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)

extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin);

#else

static inline void colibri_pxa3xx_init_mmc(mfp_cfg_t *, int, int) {}

static inline void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin) {}

#endif



#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)

extern void colibri_pxa3xx_init_lcd(int bl_pin);

#else

static inline void colibri_pxa3xx_init_lcd(int) {}

static inline void colibri_pxa3xx_init_lcd(int bl_pin) {}

#endif



#if defined(CONFIG_AX88796)

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

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


/* USB */

#define GPIO_NR_PALMT5_USB_DETECT_N		15

#define GPIO_NR_PALMT5_USB_POWER		95

#define GPIO_NR_PALMT5_USB_PULLUP		93



/* LCD/BACKLIGHT */

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

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 


/* USB */

#define GPIO_NR_PALMTX_USB_DETECT_N		13

#define GPIO_NR_PALMTX_USB_POWER		95

#define GPIO_NR_PALMTX_USB_PULLUP		93



/* LCD/BACKLIGHT */