diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /drivers/video/via | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/via')
| -rw-r--r-- | drivers/video/via/global.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h index 8e5263c5b812..7543d5f7e309 100644 --- a/drivers/video/via/global.h +++ b/drivers/video/via/global.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include "iface.h" | 38 | #include "iface.h" |
| 39 | #include "viafbdev.h" | 39 | #include "viafbdev.h" |
| 40 | #include "chip.h" | 40 | #include "chip.h" |
| 41 | #include "debug.h" | ||
| 42 | #include "accel.h" | 41 | #include "accel.h" |
| 43 | #include "share.h" | 42 | #include "share.h" |
| 44 | #include "dvi.h" | 43 | #include "dvi.h" |
| @@ -48,12 +47,10 @@ | |||
| 48 | 47 | ||
| 49 | #include "lcd.h" | 48 | #include "lcd.h" |
| 50 | #include "ioctl.h" | 49 | #include "ioctl.h" |
| 51 | #include "viamode.h" | ||
| 52 | #include "via_utility.h" | 50 | #include "via_utility.h" |
| 53 | #include "vt1636.h" | 51 | #include "vt1636.h" |
| 54 | #include "tblDPASetting.h" | 52 | #include "tblDPASetting.h" |
| 55 | #include "tbl1636.h" | 53 | #include "tbl1636.h" |
| 56 | #include "viafbdev.h" | ||
| 57 | 54 | ||
| 58 | /* External struct*/ | 55 | /* External struct*/ |
| 59 | 56 | ||