diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:20:21 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:20:21 -0800 |
| commit | 0180a7d012e413a956e3f46fcbeb8dbf3374a19c (patch) | |
| tree | 4fe9fb3d4410085ed4fc0203da9db25d026844a1 /arch/arm/mach-at91/include/mach/hardware.h | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 948ce6a6a667485e221e92af4a564839af3ba6c5 (diff) | |
Merge branch 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91 into next/drivers
* 'at91-3.4-base+device_board' of git://github.com/at91linux/linux-at91:
ARM: at91: Add external RTC for Flexibity board
ARM: at91: add Atmel ISI and ov2640 support on sam9m10g45 board
ARM: at91: add clock selection parameter for at91_add_device_isi()
ARM: at91: Update struct atmel_nand_data to support PMECC
ARM: at91/dma: DMA controller registering with DT support
ARM: at91/dma: remove platform data from DMA controller
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'arch/arm/mach-at91/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/hardware.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index 2d0e4e99856..c213f28628c 100644 --- a/arch/arm/mach-at91/include/mach/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h @@ -19,7 +19,7 @@ /* DBGU base */ /* rm9200, 9260/9g20, 9261/9g10, 9rl */ #define AT91_BASE_DBGU0 0xfffff200 -/* 9263, 9g45, cap9 */ +/* 9263, 9g45 */ #define AT91_BASE_DBGU1 0xffffee00 #if defined(CONFIG_ARCH_AT91RM9200) @@ -34,8 +34,6 @@ #include <mach/at91sam9rl.h> #elif defined(CONFIG_ARCH_AT91SAM9G45) #include <mach/at91sam9g45.h> -#elif defined(CONFIG_ARCH_AT91CAP9) -#include <mach/at91cap9.h> #elif defined(CONFIG_ARCH_AT91X40) #include <mach/at91x40.h> #else |