diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 13:09:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 13:09:45 -0400 |
commit | 7cc4e87f912bbefa440a51856b8d076e5d1f554a (patch) | |
tree | 1b8df8683f3de37d2e8211ffa8d151f60d59af62 /arch/arm/mach-at91/board-sam9rlek.c | |
parent | 5ba2f67afb02c5302b2898949ed6fc3b3d37dcf1 (diff) | |
parent | 69fc7eed5f56bce15b239e5110de2575a6970df4 (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: (236 commits)
[ARM] 5300/1: fixup spitz reset during boot
[ARM] 5295/1: make ZONE_DMA optional
[ARM] 5239/1: Palm Zire 72 power management support
[ARM] 5298/1: Drop desc_handle_irq()
[ARM] 5297/1: [KS8695] Fix two compile-time warnings
[ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
[ARM] pxa: allow multi-machine PCMCIA builds
[ARM] pxa: add preliminary CPUFREQ support for PXA3xx
[ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
[ARM] pxa/zylonite: add support for USB OHCI
[ARM] ohci-pxa27x: use ioremap() and offset for register access
[ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
[ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
[ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
[ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
[ARM] pxa: simplify DMA register definitions
[ARM] pxa: make additional DCSR bits valid for PXA3xx
[ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
...
Fixed up conflicts in
arch/arm/mach-versatile/core.c
sound/soc/pxa/pxa2xx-ac97.c
sound/soc/pxa/pxa2xx-i2s.c
manually.
Diffstat (limited to 'arch/arm/mach-at91/board-sam9rlek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9rlek.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index c6dce49c388c..270851864308 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <video/atmel_lcdc.h> | 19 | #include <video/atmel_lcdc.h> |
20 | 20 | ||
21 | #include <mach/hardware.h> | ||
22 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
23 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
24 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
@@ -27,6 +26,7 @@ | |||
27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
28 | #include <asm/mach/irq.h> | 27 | #include <asm/mach/irq.h> |
29 | 28 | ||
29 | #include <mach/hardware.h> | ||
30 | #include <mach/board.h> | 30 | #include <mach/board.h> |
31 | #include <mach/gpio.h> | 31 | #include <mach/gpio.h> |
32 | #include <mach/at91sam9_smc.h> | 32 | #include <mach/at91sam9_smc.h> |
@@ -81,11 +81,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = { | |||
81 | { | 81 | { |
82 | .name = "Partition 1", | 82 | .name = "Partition 1", |
83 | .offset = 0, | 83 | .offset = 0, |
84 | .size = 256 * 1024, | 84 | .size = SZ_256K, |
85 | }, | 85 | }, |
86 | { | 86 | { |
87 | .name = "Partition 2", | 87 | .name = "Partition 2", |
88 | .offset = 256 * 1024 , | 88 | .offset = MTDPART_OFS_NXTBLK, |
89 | .size = MTDPART_SIZ_FULL, | 89 | .size = MTDPART_SIZ_FULL, |
90 | }, | 90 | }, |
91 | }; | 91 | }; |
@@ -195,6 +195,8 @@ static void __init ek_board_init(void) | |||
195 | at91_add_device_mmc(0, &ek_mmc_data); | 195 | at91_add_device_mmc(0, &ek_mmc_data); |
196 | /* LCD Controller */ | 196 | /* LCD Controller */ |
197 | at91_add_device_lcdc(&ek_lcdc_data); | 197 | at91_add_device_lcdc(&ek_lcdc_data); |
198 | /* Touch Screen Controller */ | ||
199 | at91_add_device_tsadcc(); | ||
198 | } | 200 | } |
199 | 201 | ||
200 | MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK") | 202 | MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK") |