diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 21:52:33 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 11:07:48 +0100 |
| commit | bde755679a3ba5af0d16231f8532e8373c5e2ecc (patch) | |
| tree | 782fa01306ada3e084bd3c47ea1af378b97c0e16 /arch/arm/mach-exynos/common.c | |
| parent | Merge branch 'renesas/soc' into next/soc (diff) | |
| parent | ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver (diff) | |
| download | linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.xz linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.zip | |
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
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>
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 7f1f2687147d..519ef0ecd0fa 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -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; |