diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 16:26:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 16:26:31 +0200 |
| commit | b7d0b6784565b846f3562608dfb3cf8516718724 (patch) | |
| tree | 50a4931ce7e62e78b664bb8f43da2f4508c319f9 /include/asm-arm/arch-pxa/pxa25x-udc.h | |
| parent | cdcf772ed163651cacac8098b4974aba7f9e1c73 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/intel_cacheinfo.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-arm/arch-pxa/pxa25x-udc.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxa25x-udc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/pxa25x-udc.h b/include/asm-arm/arch-pxa/pxa25x-udc.h index 840305916b6..1b80a4805a6 100644 --- a/include/asm-arm/arch-pxa/pxa25x-udc.h +++ b/include/asm-arm/arch-pxa/pxa25x-udc.h @@ -2,7 +2,7 @@ #define _ASM_ARCH_PXA25X_UDC_H #ifdef _ASM_ARCH_PXA27X_UDC_H -#error You can't include both PXA25x and PXA27x UDC support +#error "You can't include both PXA25x and PXA27x UDC support" #endif #define UDC_RES1 __REG(0x40600004) /* UDC Undocumented - Reserved1 */ |