diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /drivers/video/intelfb/intelfbdrv.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
| -rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 2 |
1 files changed, 1 insertions, 1 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 | ||