diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-11 14:33:03 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-11 14:33:03 +0100 |
| commit | 11a25ea7e4f870a37093258f577e11cec703e37e (patch) | |
| tree | a38c0badd6f8d866724c21697bb8f580e8ede9b6 /arch/arm/mach-at91/include/mach/hardware.h | |
| parent | 9acacb13b0df28742785dbdbb14f2ae13c0063b7 (diff) | |
| parent | 76e805769c54127e449b5e0c19472c28ac3d4831 (diff) | |
Merge remote-tracking branch 'armsoc/at91/9x5' into at91-3.4-base2
Diffstat (limited to 'arch/arm/mach-at91/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/hardware.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index c213f28628c..fd7dce4f737 100644 --- a/arch/arm/mach-at91/include/mach/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h @@ -34,6 +34,8 @@ #include <mach/at91sam9rl.h> #elif defined(CONFIG_ARCH_AT91SAM9G45) #include <mach/at91sam9g45.h> +#elif defined(CONFIG_ARCH_AT91SAM9X5) +#include <mach/at91sam9x5.h> #elif defined(CONFIG_ARCH_AT91X40) #include <mach/at91x40.h> #else |