diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/avr32 | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/mach-at32ap/include/mach/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h index c253e9bb5616..9c96a130f3a8 100644 --- a/arch/avr32/mach-at32ap/include/mach/cpu.h +++ b/arch/avr32/mach-at32ap/include/mach/cpu.h | |||
| @@ -33,5 +33,6 @@ | |||
| 33 | #define cpu_is_at91cap9() (0) | 33 | #define cpu_is_at91cap9() (0) |
| 34 | #define cpu_is_at91sam9g10() (0) | 34 | #define cpu_is_at91sam9g10() (0) |
| 35 | #define cpu_is_at91sam9g45() (0) | 35 | #define cpu_is_at91sam9g45() (0) |
| 36 | #define cpu_is_at91sam9g45es() (0) | ||
| 36 | 37 | ||
| 37 | #endif /* __ASM_ARCH_CPU_H */ | 38 | #endif /* __ASM_ARCH_CPU_H */ |