git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
setup.h
diff --git
a/arch/x86/include/asm/setup.h
b/arch/x86/include/asm/setup.h
index
d6763b1
..
db8aa19
100644
(file)
--- a/
arch/x86/include/asm/setup.h
+++ b/
arch/x86/include/asm/setup.h
@@
-53,6
+53,12
@@
extern void x86_mrst_early_setup(void);
static inline void x86_mrst_early_setup(void) { }
#endif
+#ifdef CONFIG_X86_INTEL_CE
+extern void x86_ce4100_early_setup(void);
+#else
+static inline void x86_ce4100_early_setup(void) { }
+#endif
+
#ifndef _SETUP
/*