xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'samsung/cleanup-exynos-clock' into next/soc

Browse Source 
Conflicts:
	arch/arm/mach-exynos/clock-exynos4.c
	arch/arm/mach-exynos/clock.c

The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2012-03-19 20:52:33 +00:00
parent 62a16d025c 44b2cef5ae
commit bde755679a
35 changed files with 2072 additions and 2053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-exynos/common.c
View File

@@ -695,7 +695,7 @@ static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc)
chained_irq_exit(chip, desc);
}
int __init exynos4_init_irq_eint(void)
static int __init exynos4_init_irq_eint(void)
{
int irq;