diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/video/intelfb | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/intelfb')
| -rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 2 | ||||
| -rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 3f39d84015f1..06af89d44a0d 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
| @@ -113,7 +113,6 @@ | |||
| 113 | #include <linux/errno.h> | 113 | #include <linux/errno.h> |
| 114 | #include <linux/string.h> | 114 | #include <linux/string.h> |
| 115 | #include <linux/mm.h> | 115 | #include <linux/mm.h> |
| 116 | #include <linux/tty.h> | ||
| 117 | #include <linux/slab.h> | 116 | #include <linux/slab.h> |
| 118 | #include <linux/delay.h> | 117 | #include <linux/delay.h> |
| 119 | #include <linux/fb.h> | 118 | #include <linux/fb.h> |
| @@ -122,6 +121,7 @@ | |||
| 122 | #include <linux/pci.h> | 121 | #include <linux/pci.h> |
| 123 | #include <linux/vmalloc.h> | 122 | #include <linux/vmalloc.h> |
| 124 | #include <linux/pagemap.h> | 123 | #include <linux/pagemap.h> |
| 124 | #include <linux/screen_info.h> | ||
| 125 | 125 | ||
| 126 | #include <asm/io.h> | 126 | #include <asm/io.h> |
| 127 | 127 | ||
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 3b78a57924f0..2a9322f9cfdc 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 27 | #include <linux/tty.h> | ||
| 28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/fb.h> | 29 | #include <linux/fb.h> |