diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-03-05 05:00:46 +0100 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-05 05:00:46 +0100 |
| commit | d50673ed97a7ce609cf62bcd40c57517ada31806 (patch) | |
| tree | de1464fe1a4126be6b34762015afb8ad8a90a2f0 /arch/arm/mach-at91/soc.h | |
| parent | Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlin... (diff) | |
| parent | Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at9... (diff) | |
| download | linux-d50673ed97a7ce609cf62bcd40c57517ada31806.tar.xz linux-d50673ed97a7ce609cf62bcd40c57517ada31806.zip | |
Merge remote-tracking branch 'arm-soc/at91/base2+cleanup' into cleanup-base
Diffstat (limited to 'arch/arm/mach-at91/soc.h')
| -rw-r--r-- | arch/arm/mach-at91/soc.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/soc.h b/arch/arm/mach-at91/soc.h index 4588ae6f7acd..5db4aa45404a 100644 --- a/arch/arm/mach-at91/soc.h +++ b/arch/arm/mach-at91/soc.h @@ -13,7 +13,6 @@ struct at91_init_soc { }; extern struct at91_init_soc at91_boot_soc; -extern struct at91_init_soc at91cap9_soc; extern struct at91_init_soc at91rm9200_soc; extern struct at91_init_soc at91sam9260_soc; extern struct at91_init_soc at91sam9261_soc; @@ -27,10 +26,6 @@ static inline int at91_soc_is_enabled(void) return at91_boot_soc.init != NULL; } -#if !defined(CONFIG_ARCH_AT91CAP9) -#define at91cap9_soc at91_boot_soc -#endif - #if !defined(CONFIG_ARCH_AT91RM9200) #define at91rm9200_soc at91_boot_soc #endif |