diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 15:38:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 15:38:42 -0400 |
| commit | ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21 (patch) | |
| tree | 2bff2e4f4456077e7d7c589c8c28824f12dfa21c /arch/arm/mach-s5pv210/mach-aquila.c | |
| parent | dd58ecba48edf14be1a5f70120fcd3002277a74a (diff) | |
| parent | ab2a0e0d135490729e384c1826d118f92e88cae8 (diff) | |
Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)
ARM: EXYNOS4: Change devname for FIMD clkdev
ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx
ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210
ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
ARM: S3C24XX: Use generic s3c_set_platdata for devices
ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND
ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI
ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON
ARM: SAMSUNG: Use generic s3c_set_platdata for FB
ARM: SAMSUNG: Use generic s3c_set_platdata for TS
ARM: S3C64XX: Add PWM backlight support on SMDK6410
ARM: S5P64X0: Add PWM backlight support on SMDK6450
ARM: S5P64X0: Add PWM backlight support on SMDK6440
ARM: S5PC100: Add PWM backlight support on SMDKC100
ARM: S5PV210: Add PWM backlight support on SMDKV210
ARM: EXYNOS4: Add PWM backlight support on SMDKC210
ARM: EXYNOS4: Add PWM backlight support on SMDKV310
ARM: SAMSUNG: Create a common infrastructure for PWM backlight support
clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0
...
Fix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-aquila.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-aquila.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 4e1d8ff5ae59..509627f25111 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <mach/map.h> | 30 | #include <mach/map.h> |
| 31 | #include <mach/regs-clock.h> | 31 | #include <mach/regs-clock.h> |
| 32 | #include <mach/regs-fb.h> | ||
| 33 | 32 | ||
| 34 | #include <plat/gpio-cfg.h> | 33 | #include <plat/gpio-cfg.h> |
| 35 | #include <plat/regs-serial.h> | 34 | #include <plat/regs-serial.h> |
| @@ -40,6 +39,7 @@ | |||
| 40 | #include <plat/fimc-core.h> | 39 | #include <plat/fimc-core.h> |
| 41 | #include <plat/sdhci.h> | 40 | #include <plat/sdhci.h> |
| 42 | #include <plat/s5p-time.h> | 41 | #include <plat/s5p-time.h> |
| 42 | #include <plat/regs-fb-v4.h> | ||
| 43 | 43 | ||
| 44 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 44 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
| 45 | #define AQUILA_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 45 | #define AQUILA_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |