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

Commit 261ca205 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 725278e0 72feb6e7

arch/arm/include/asm/hardware/it8152.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ extern unsigned long it8152_base_address; 
  IT8152_PD_IRQ(1)  USB (USBR)

  IT8152_PD_IRQ(0)  Audio controller (ACR)

 */

#define IT8152_IRQ(x)   (IRQ_BOARD_END + (x))

#define IT8152_IRQ(x)   (IRQ_BOARD_START + (x))



/* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */

#define IT8152_LD_IRQ_COUNT     9

arch/arm/mach-mmp/include/mach/cputype.h

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ static inline int cpu_is_pxa910(void) 
#ifdef CONFIG_CPU_MMP2

static inline int cpu_is_mmp2(void)

{

	return (((cpu_readid_id() >> 8) & 0xff) == 0x58);

	return (((read_cpuid_id() >> 8) & 0xff) == 0x58);

}

#else

#define cpu_is_mmp2()	(0)

#endif

arch/arm/mach-pxa/cm-x2xx.c

+0 −2
Original line number Diff line number Diff line
@@ -476,8 +476,6 @@ static void __init cmx2xx_init(void) 


static void __init cmx2xx_init_irq(void)

{

	pxa27x_init_irq();



	if (cpu_is_pxa25x()) {

		pxa25x_init_irq();

		cmx2xx_pci_init_irq(CMX255_GPIO_IT8152_IRQ);

arch/arm/mach-pxa/saar.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static struct platform_device smc91x_device = { 
	},

};



#if defined(CONFIG_FB_PXA) || (CONFIG_FB_PXA_MODULE)

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

static uint16_t lcd_power_on[] = {

	/* single frame */

	SMART_CMD_NOOP,