diff options
| author | Catalin Marinas <catalin.marinas@com.rmk.(none)> | 2004-11-05 18:19:54 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-11-05 18:19:54 +0000 |
| commit | bbad8b176deca18f1bda26f134a14ddd303317fc (patch) | |
| tree | 945593d77bbb48df2e23e5f3b36722aa969090cb /arch/arm/kernel | |
| parent | d57cdf16d53fd9202f88122f395c5801f82d1af6 (diff) | |
[ARM] Versatile: patch-2.6.9-common
Patch from Catalin Marinas
Common changes for Versatile PB and AB
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/debug.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 5335e4662554..78146b6c3d4e 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -647,7 +647,7 @@ .endm -#elif defined(CONFIG_ARCH_VERSATILE_PB) +#elif defined(CONFIG_ARCH_VERSATILE) #include <asm/hardware/amba_serial.h> diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 5639f1b618f9..6ad406bd9c6e 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -464,7 +464,7 @@ ENTRY(soft_irq_mask) .macro irq_prio_table .endm -#elif defined(CONFIG_ARCH_VERSATILE_PB) +#elif defined(CONFIG_ARCH_VERSATILE) .macro disable_fiq .endm |