summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2017-05-17 11:29:34 +0300
committerMatt Turner <mattst88@gmail.com>2017-09-04 22:04:30 +0300
commit1c0234aac80b9b20d7685ad0fc04ec0ab676684f (patch)
tree5bdc9fb9ebc50ff227503364e455ab53acf1989b /arch
parentdd689a68bc3551ad7bdff2c881fede5f0bd12cfa (diff)
downloadlinux-1c0234aac80b9b20d7685ad0fc04ec0ab676684f.tar.xz
alpha: use generic fb.h
The arch uses a verbatim copy of the asm-generic version and does not add any own implemntations to the header, so use asm-generic/fb.h instead of duplicating code. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/include/asm/Kbuild1
-rw-r--r--arch/alpha/include/asm/fb.h13
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index d103db5af5ff..5b974ab8425c 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -3,6 +3,7 @@
generic-y += clkdev.h
generic-y += exec.h
generic-y += export.h
+generic-y += fb.h
generic-y += irq_work.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
diff --git a/arch/alpha/include/asm/fb.h b/arch/alpha/include/asm/fb.h
deleted file mode 100644
index fa9bbb96b2b3..000000000000
--- a/arch/alpha/include/asm/fb.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/device.h>
-
-/* Caching is off in the I/O space quadrant by design. */
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
- return 0;
-}
-
-#endif /* _ASM_FB_H_ */