summaryrefslogtreecommitdiff
path: root/include/asm-frv/setup.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-05 13:12:55 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-05 13:12:55 +0400
commitf3831a592fe4332a70baad64a860b345398885b7 (patch)
treefd27b986295fe5a4f1c0924a804228f829a4c894 /include/asm-frv/setup.h
parent376f7839b72ec526173cafb5d8eadfc61e2effdf (diff)
parent8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff)
downloadlinux-f3831a592fe4332a70baad64a860b345398885b7.tar.xz
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'include/asm-frv/setup.h')
-rw-r--r--include/asm-frv/setup.h31
1 files changed, 0 insertions, 31 deletions
diff --git a/include/asm-frv/setup.h b/include/asm-frv/setup.h
deleted file mode 100644
index afd787ceede6..000000000000
--- a/include/asm-frv/setup.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* setup.h: setup stuff
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * 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.
- */
-
-#ifndef _ASM_SETUP_H
-#define _ASM_SETUP_H
-
-#define COMMAND_LINE_SIZE 512
-
-#ifdef __KERNEL__
-
-#include <linux/init.h>
-
-#ifndef __ASSEMBLY__
-
-#ifdef CONFIG_MMU
-extern unsigned long __initdata num_mappedpages;
-#endif
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_SETUP_H */