diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/video/epson1355fb.c | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/epson1355fb.c')
| -rw-r--r-- | drivers/video/epson1355fb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index 116e808d71cd..7363d0b25fdf 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
| @@ -54,6 +54,8 @@ | |||
| 54 | #include <linux/fb.h> | 54 | #include <linux/fb.h> |
| 55 | #include <linux/init.h> | 55 | #include <linux/init.h> |
| 56 | #include <linux/ioport.h> | 56 | #include <linux/ioport.h> |
| 57 | #include <linux/platform_device.h> | ||
| 58 | |||
| 57 | #include <asm/types.h> | 59 | #include <asm/types.h> |
| 58 | #include <asm/io.h> | 60 | #include <asm/io.h> |
| 59 | #include <asm/uaccess.h> | 61 | #include <asm/uaccess.h> |