diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2017-07-10 18:50:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-10 19:32:34 -0400 |
commit | 31b7fb448c2bda757f3386c3eb50c2718bf6d776 (patch) | |
tree | 1a9e948b06e542f590c7a8d09a8c079702ace915 /arch/frv | |
parent | a371e2fa3ab993c915eaa713333d8981823dffe8 (diff) |
frv: use generic fb.h
The arch uses a verbatim copy of the asm-generic version and does not
add any own implementations to the header, so use asm-generic/fb.h
instead of duplicating code.
Link: http://lkml.kernel.org/r/20170517083307.1697-1-tklauser@distanz.ch
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv')
-rw-r--r-- | arch/frv/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/frv/include/asm/fb.h | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index 69f612a55634..2cf7648787b2 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild | |||
@@ -3,6 +3,7 @@ generic-y += clkdev.h | |||
3 | generic-y += device.h | 3 | generic-y += device.h |
4 | generic-y += exec.h | 4 | generic-y += exec.h |
5 | generic-y += extable.h | 5 | generic-y += extable.h |
6 | generic-y += fb.h | ||
6 | generic-y += irq_work.h | 7 | generic-y += irq_work.h |
7 | generic-y += mcs_spinlock.h | 8 | generic-y += mcs_spinlock.h |
8 | generic-y += mm-arch-hooks.h | 9 | generic-y += mm-arch-hooks.h |
diff --git a/arch/frv/include/asm/fb.h b/arch/frv/include/asm/fb.h deleted file mode 100644 index c7df38030992..000000000000 --- a/arch/frv/include/asm/fb.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | #include <linux/fb.h> | ||
4 | |||
5 | #define fb_pgprotect(...) do {} while (0) | ||
6 | |||
7 | static inline int fb_is_primary_device(struct fb_info *info) | ||
8 | { | ||
9 | return 0; | ||
10 | } | ||
11 | |||
12 | #endif /* _ASM_FB_H_ */ | ||