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 6216b86..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,35 +1,20 @@
 /*
 /*

- *  $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
  *     Copyright (C) 2004 Maciej W. Rozycki
  *
  *
  *  This file was derived from: include/asm-mips/cpu-features.h
  *     Copyright (C) 2003, 2004 Ralf Baechle
  *     Copyright (C) 2004 Maciej W. Rozycki
  *

- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.

  *
  *

- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.

  */
 #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.
  */


@@ -83,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 */