From: Al Stone al.stone@linaro.org
Signed-off-by: Al Stone al.stone@linaro.org --- arch/arm/include/asm/processor.h | 6 ------ arch/arm64/include/asm/processor.h | 6 ------ 2 files changed, 12 deletions(-)
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index abff94a..250cc11 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h @@ -108,10 +108,6 @@ static inline void prefetch(const void *ptr) #define ARCH_HAS_SPINLOCK_PREFETCH #define spin_lock_prefetch(x) do { } while (0)
-/* - * Not all ARM devices have ACPI, but some do - * BOZO: is this correct? - */ #ifdef CONFIG_ACPI enum idle_boot_override { IDLE_NO_OVERRIDE = 0, IDLE_HALT, IDLE_NOMWAIT, IDLE_POLL, IDLE_FORCE_MWAIT }; @@ -119,8 +115,6 @@ enum idle_boot_override { IDLE_NO_OVERRIDE = 0, IDLE_HALT, IDLE_NOMWAIT, extern unsigned long boot_option_idle_override; #endif
-/* end BOZO */ - #endif
#define HAVE_ARCH_PICK_MMAP_LAYOUT diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 53326fd..550e052 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -155,10 +155,6 @@ static inline void spin_lock_prefetch(const void *x) prefetchw(x); }
-/* - * Not all ARM devices have ACPI, but some do - * BOZO: is this correct? - */ #ifdef CONFIG_ACPI enum idle_boot_override { IDLE_NO_OVERRIDE = 0, IDLE_HALT, IDLE_NOMWAIT, IDLE_POLL, IDLE_FORCE_MWAIT }; @@ -166,8 +162,6 @@ enum idle_boot_override { IDLE_NO_OVERRIDE = 0, IDLE_HALT, IDLE_NOMWAIT, extern unsigned long boot_option_idle_override; #endif
-/* end BOZO */ - #define HAVE_ARCH_PICK_MMAP_LAYOUT
#endif