summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/fb.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 00:30:55 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 00:30:55 +0100
commitd15c22e78674f9a5bc0de0932a43abe1aafae303 (patch)
tree3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/m68k/include/asm/fb.h
parentInput: psmouse - add newline to OLPC HGPK touchpad debugging (diff)
parentLinux 2.6.29-rc7 (diff)
downloadlinux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz
linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'arch/m68k/include/asm/fb.h')
-rw-r--r--arch/m68k/include/asm/fb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h
new file mode 100644
index 000000000000..97bcaefd2064
--- /dev/null
+++ b/arch/m68k/include/asm/fb.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "fb_no.h"
+#else
+#include "fb_mm.h"
+#endif