diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 14:22:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 14:22:59 -0400 |
| commit | 7578634990fb47cc30083fbd812689aa6deacfc0 (patch) | |
| tree | f493860658579d9572a19b3a41fcea2de035e49f /arch/arm/mach-s3c2412/mach-vstms.c | |
| parent | d7f5e3df3574c6e38b99f5fe22f15540b2b9811d (diff) | |
| parent | 5957a4eb284dd6f522b248b674792416466555b2 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (60 commits)
[ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410
[ARM] 4523/1: S3C: Remove FIFO_MAX from uncompression headers
[ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h
[ARM] 4521/2: S3C: Reorganise VA mapping headers
[ARM] 4520/1: S3C: Remove old VA values from static map
[ARM] 4519/1: S3C: split S3C2400 values out of S3C24XX map.h
[ARM] 4518/1: S3C: Rename watchdog configuration options
[ARM] 4517/1: S3C: Fix debug macros for ARM926 output
[ARM] 4516/1: S3C: Fix uncompressor serial output for ARM926
[ARM] 4515/1: S3C: Move uncompress code to plat-s3c
[ARM] 4514/1: S3C: Rename DEBUG_S3C2410_PORT and DEBUG_S3C_UART
[ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT
[ARM] 4512/1: S3C: rename the debug macros for per-cpu updates
[ARM] 4511/1: S3C: updated LLSERIAL Kconfig defines for CPU support
[ARM] 4510/1: S3C: split debug-macro support into plat-s3c
[ARM] 4509/1: S3C: Create initial arch/arm/plat-s3c
[ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c
[ARM] 4461/1: MXC platform and i.MX31ADS core support
[ARM] 4507/1: pxa2xx clock_event_device
[ARM] 4497/1: Only allow safe cache configurations on ARMv6 and later
...
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-vstms.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-vstms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c index f2fbd65956ac..32982547cd63 100644 --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c | |||
| @@ -33,14 +33,14 @@ | |||
| 33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
| 34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
| 35 | 35 | ||
| 36 | #include <asm/arch/regs-serial.h> | 36 | #include <asm/plat-s3c/regs-serial.h> |
| 37 | #include <asm/arch/regs-gpio.h> | 37 | #include <asm/arch/regs-gpio.h> |
| 38 | #include <asm/arch/regs-lcd.h> | 38 | #include <asm/arch/regs-lcd.h> |
| 39 | 39 | ||
| 40 | #include <asm/arch/idle.h> | 40 | #include <asm/arch/idle.h> |
| 41 | #include <asm/arch/fb.h> | 41 | #include <asm/arch/fb.h> |
| 42 | 42 | ||
| 43 | #include <asm/arch/nand.h> | 43 | #include <asm/plat-s3c/nand.h> |
| 44 | 44 | ||
| 45 | #include <asm/plat-s3c24xx/s3c2410.h> | 45 | #include <asm/plat-s3c24xx/s3c2410.h> |
| 46 | #include <asm/plat-s3c24xx/s3c2412.h> | 46 | #include <asm/plat-s3c24xx/s3c2412.h> |