diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/arm/mach-at91/include/mach/hardware.h | |
| parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
| parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index da0b681c652c..a0df8b022df2 100644 --- a/arch/arm/mach-at91/include/mach/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h | |||
| @@ -20,12 +20,14 @@ | |||
| 20 | #include <mach/at91rm9200.h> | 20 | #include <mach/at91rm9200.h> |
| 21 | #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) | 21 | #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) |
| 22 | #include <mach/at91sam9260.h> | 22 | #include <mach/at91sam9260.h> |
| 23 | #elif defined(CONFIG_ARCH_AT91SAM9261) | 23 | #elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10) |
| 24 | #include <mach/at91sam9261.h> | 24 | #include <mach/at91sam9261.h> |
| 25 | #elif defined(CONFIG_ARCH_AT91SAM9263) | 25 | #elif defined(CONFIG_ARCH_AT91SAM9263) |
| 26 | #include <mach/at91sam9263.h> | 26 | #include <mach/at91sam9263.h> |
| 27 | #elif defined(CONFIG_ARCH_AT91SAM9RL) | 27 | #elif defined(CONFIG_ARCH_AT91SAM9RL) |
| 28 | #include <mach/at91sam9rl.h> | 28 | #include <mach/at91sam9rl.h> |
| 29 | #elif defined(CONFIG_ARCH_AT91SAM9G45) | ||
| 30 | #include <mach/at91sam9g45.h> | ||
| 29 | #elif defined(CONFIG_ARCH_AT91CAP9) | 31 | #elif defined(CONFIG_ARCH_AT91CAP9) |
| 30 | #include <mach/at91cap9.h> | 32 | #include <mach/at91cap9.h> |
| 31 | #elif defined(CONFIG_ARCH_AT91X40) | 33 | #elif defined(CONFIG_ARCH_AT91X40) |