summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/setup.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-08 16:30:55 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-08 16:30:55 -0700
commitd15c22e78674f9a5bc0de0932a43abe1aafae303 (patch)
tree3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/m68k/include/asm/setup.h
parent0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff)
parentfec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff)
downloadop-kernel-dev-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip
op-kernel-dev-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.gz
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'arch/m68k/include/asm/setup.h')
-rw-r--r--arch/m68k/include/asm/setup.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h
new file mode 100644
index 0000000..842f86f
--- /dev/null
+++ b/arch/m68k/include/asm/setup.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "setup_no.h"
+#else
+#include "setup_mm.h"
+#endif
OpenPOWER on IntegriCloud