Add support for creating VMware vmdk images #1317

[openwrt.git] / target / linux / adm5120 / files / include / asm-mips / mach-adm5120 / cpu-feature-overrides.h

diff --git a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
index 1ca5559..c6310cc 100644 (file)
--- a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
+++ b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
@@ -1,10 +1,7 @@
 /*
 /*

- *  $Id$
- *

  *  ADM5120 specific CPU feature overrides
  *
  *  ADM5120 specific CPU feature overrides
  *

- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>

  *
  *  This file was derived from: include/asm-mips/cpu-features.h
  *     Copyright (C) 2003, 2004 Ralf Baechle
  *
  *  This file was derived from: include/asm-mips/cpu-features.h
  *     Copyright (C) 2003, 2004 Ralf Baechle


@@ -18,8 +15,6 @@
 #ifndef __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H
 
 #ifndef __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H
 

-#ifdef CONFIG_ADM5120_CPU_OVERRIDES
-

 /*
  * The ADM5120 SOC has a built-in MIPS 4Kc core.
  */
 /*
  * The ADM5120 SOC has a built-in MIPS 4Kc core.
  */


@@ -73,7 +68,4 @@
 #define cpu_dcache_line_size()         16
 #define cpu_icache_line_size()         16
 
 #define cpu_dcache_line_size()         16
 #define cpu_icache_line_size()         16
 

-#endif  /* CONFIG_ADM5120_CPU_OVERRIDES */
-
-

 #endif /* __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H */
 #endif /* __ASM_MACH_ADM5120_CPU_FEATURE_OVERRIDES_H */