diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-06-26 03:26:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 12:58:28 -0400 |
| commit | 22f4a00fd5207a107fb81984f7b4cc09e5047b45 (patch) | |
| tree | d051e758c7a2e509605ee0d699b973f3067ed031 /drivers/video/fbmem.c | |
| parent | 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 (diff) | |
[PATCH] fbdev: Remove duplicate #include's
Remove unneeded duplicate #include's of the same header file.
In the case of fbmon.c linux/pci.h is now #include'd unconditional, but
this should be safe.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 372aa1776827..9bb6763d0cb8 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #endif | 34 | #endif |
| 35 | #include <linux/devfs_fs_kernel.h> | 35 | #include <linux/devfs_fs_kernel.h> |
| 36 | #include <linux/err.h> | 36 | #include <linux/err.h> |
| 37 | #include <linux/kernel.h> | ||
| 38 | #include <linux/device.h> | 37 | #include <linux/device.h> |
| 39 | #include <linux/efi.h> | 38 | #include <linux/efi.h> |
| 40 | 39 | ||
| @@ -162,7 +161,6 @@ char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size | |||
| 162 | } | 161 | } |
| 163 | 162 | ||
| 164 | #ifdef CONFIG_LOGO | 163 | #ifdef CONFIG_LOGO |
| 165 | #include <linux/linux_logo.h> | ||
| 166 | 164 | ||
| 167 | static inline unsigned safe_shift(unsigned d, int n) | 165 | static inline unsigned safe_shift(unsigned d, int n) |
| 168 | { | 166 | { |