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

Commit ec773e99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
  ARM: PXA: fix gpio-pxa.h build errors
  ARM: 7142/1: davinci: mark GPIO implementation complex
  ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
  ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
  ARM: PXA: fix lubbock PCMCIA driver build error
parents 534baf55 7a3f8de5

arch/arm/mach-davinci/include/mach/gpio.h

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




#include <asm-generic/gpio.h>

#include <asm-generic/gpio.h>





#define __ARM_GPIOLIB_COMPLEX



/* The inline versions use the static inlines in the driver header */

/* The inline versions use the static inlines in the driver header */

#include "gpio-davinci.h"

#include "gpio-davinci.h"

arch/arm/mach-exynos/platsmp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -110,8 +110,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu) 
	 */

	 */

	spin_lock(&boot_lock);

	spin_lock(&boot_lock);

	spin_unlock(&boot_lock);

	spin_unlock(&boot_lock);



	set_cpu_online(cpu, true);

}

}





int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)

int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)

arch/arm/mach-pxa/eseries.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ static struct clk_lookup eseries_clkregs[] = { 
	INIT_CLKREG(&tmio_dummy_clk, NULL, "CLK_CK32K"),

	INIT_CLKREG(&tmio_dummy_clk, NULL, "CLK_CK32K"),

};

};





void eseries_register_clks(void)

static void __init eseries_register_clks(void)

{

{

	clkdev_add_table(eseries_clkregs, ARRAY_SIZE(eseries_clkregs));

	clkdev_add_table(eseries_clkregs, ARRAY_SIZE(eseries_clkregs));

}

}

arch/arm/mach-pxa/eseries.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -11,5 +11,4 @@ extern int eseries_tmio_resume(struct platform_device *dev); 
extern void eseries_get_tmio_gpios(void);

extern void eseries_get_tmio_gpios(void);

extern struct resource eseries_tmio_resources[];

extern struct resource eseries_tmio_resources[];

extern struct platform_device e300_tc6387xb_device;

extern struct platform_device e300_tc6387xb_device;

extern void eseries_register_clks(void);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define GPIO_REGS_VIRT	io_p2v(0x40E00000)

#define GPIO_REGS_VIRT	io_p2v(0x40E00000)





#define BANK_OFF(n)	(((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))

#define BANK_OFF(n)	(((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))

#define GPIO_REG(x)	(GPIO_REGS_VIRT + (x))

#define GPIO_REG(x)	(*(volatile u32 *)(GPIO_REGS_VIRT + (x)))





/* GPIO Pin Level Registers */

/* GPIO Pin Level Registers */

#define GPLR0		GPIO_REG(BANK_OFF(0) + 0x00)

#define GPLR0		GPIO_REG(BANK_OFF(0) + 0x00)