diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/video/sgivwfb.c | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'drivers/video/sgivwfb.c')
| -rw-r--r-- | drivers/video/sgivwfb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c index 8413907b379a..cf5106eab2d5 100644 --- a/drivers/video/sgivwfb.c +++ b/drivers/video/sgivwfb.c | |||
| @@ -18,6 +18,8 @@ | |||
| 18 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
| 21 | #include <linux/platform_device.h> | ||
| 22 | |||
| 21 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 22 | #include <asm/mtrr.h> | 24 | #include <asm/mtrr.h> |
| 23 | 25 | ||