diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:25:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:25:32 -0400 |
| commit | 8ef50901d3c619127858b7d7f614fcab45e09d6b (patch) | |
| tree | e75a0d48029d4a5857033e4edf1cd572a5a3fc62 /arch/arm/plat-s3c24xx/s3c244x.c | |
| parent | 435263702ef0fc9ffdc6301a71c03b1d9ac0f1e0 (diff) | |
| parent | 2502991560dc8244dbe10e48473d85722c1e2ec1 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (51 commits)
[ARM] 5308/1: Fix Viper ISA IRQ handling
[ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build error
[ARM] 5306/1: pxa: fix build error on CM-X270
[ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
[ARM] 5305/1: ARM: OMAP: Fix compile of McBSP by removing unnecessary check
[ARM] 5301/1: ARM: OMAP: Add missing irq defines
ARM: OMAP3: Add default kernel config for OMAP LDP
ARM: OMAP3: Add basic board support for OMAP LDP
ARM: OMAP3: Defconfig for the Gumstix Overo board (rev 3)
ARM: OMAP3: Add support for the Gumstix Overo board (rev 3)
ARM: OMAP3: Add Beagle defconfig
ARM: OMAP3: Add minimal Beagle board support
ARM: OMAP3: Add minimal omap3430 support
ARM: OMAP2: Fix sparse, checkpatch warnings in OMAP2/3 IRQ code
ARM: OMAP: Fixes to omap_mcbsp_request function
ARM: OMAP: Add support for OMAP2430 in McBSP
ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
ARM: OMAP: Allocate McBSP devices dynamically
Fix sections for omap-mcbsp platform driver
[ARM] S3C24XX: Additional include moves
...
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c244x.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/s3c244x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index 146863a69aeb..c0344fac4a94 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c | |||
| @@ -30,18 +30,18 @@ | |||
| 30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
| 31 | 31 | ||
| 32 | #include <mach/regs-clock.h> | 32 | #include <mach/regs-clock.h> |
| 33 | #include <asm/plat-s3c/regs-serial.h> | 33 | #include <plat/regs-serial.h> |
| 34 | #include <mach/regs-gpio.h> | 34 | #include <mach/regs-gpio.h> |
| 35 | #include <mach/regs-gpioj.h> | 35 | #include <mach/regs-gpioj.h> |
| 36 | #include <mach/regs-dsc.h> | 36 | #include <mach/regs-dsc.h> |
| 37 | 37 | ||
| 38 | #include <asm/plat-s3c24xx/s3c2410.h> | 38 | #include <plat/s3c2410.h> |
| 39 | #include <asm/plat-s3c24xx/s3c2440.h> | 39 | #include <plat/s3c2440.h> |
| 40 | #include "s3c244x.h" | 40 | #include "s3c244x.h" |
| 41 | #include <asm/plat-s3c24xx/clock.h> | 41 | #include <plat/clock.h> |
| 42 | #include <asm/plat-s3c24xx/devs.h> | 42 | #include <plat/devs.h> |
| 43 | #include <asm/plat-s3c24xx/cpu.h> | 43 | #include <plat/cpu.h> |
| 44 | #include <asm/plat-s3c24xx/pm.h> | 44 | #include <plat/pm.h> |
| 45 | 45 | ||
| 46 | static struct map_desc s3c244x_iodesc[] __initdata = { | 46 | static struct map_desc s3c244x_iodesc[] __initdata = { |
| 47 | IODESC_ENT(CLKPWR), | 47 | IODESC_ENT(CLKPWR), |