summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/fb.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
commita12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch)
tree957c915298b299902aa80afa7c78e94c71b3dc25 /include/asm-s390/fb.h
parentx86: fix setup code crashes on my old 486 box (diff)
parentLinux 2.6.27-rc3 (diff)
downloadlinux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz
linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'include/asm-s390/fb.h')
-rw-r--r--include/asm-s390/fb.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-s390/fb.h b/include/asm-s390/fb.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/include/asm-s390/fb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
- return 0;
-}
-
-#endif /* _ASM_FB_H_ */