summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/via/accel.c2
-rw-r--r--drivers/video/via/dvi.c4
-rw-r--r--drivers/video/via/hw.c3
-rw-r--r--drivers/video/via/lcd.c4
-rw-r--r--drivers/video/via/via-core.c6
-rw-r--r--drivers/video/via/via-gpio.c4
-rw-r--r--drivers/video/via/via_i2c.c4
-rw-r--r--drivers/video/via/via_modesetting.c2
-rw-r--r--drivers/video/via/via_utility.c2
-rw-r--r--drivers/video/via/viafbdev.c4
-rw-r--r--drivers/video/via/viamode.c2
-rw-r--r--drivers/video/via/vt1636.c4
-rw-r--r--include/linux/via-core.h (renamed from drivers/video/via/via-core.h)0
-rw-r--r--include/linux/via-gpio.h (renamed from drivers/video/via/via-gpio.h)0
-rw-r--r--include/linux/via_i2c.h (renamed from drivers/video/via/via_i2c.h)0
15 files changed, 21 insertions, 20 deletions
diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index 189aba41f9b9..e44893ea590d 100644
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -18,7 +18,7 @@
* Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "via-core.h"
+#include <linux/via-core.h>
#include "global.h"
/*
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
index 6271b7696323..39b040bb3817 100644
--- a/drivers/video/via/dvi.c
+++ b/drivers/video/via/dvi.c
@@ -18,8 +18,8 @@
* Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "via-core.h"
-#include "via_i2c.h"
+#include <linux/via-core.h>
+#include <linux/via_i2c.h>
#include "global.h"
static void tmds_register_write(int index, u8 data);
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index e356fe8d8a90..b996803ae2c1 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -18,7 +18,8 @@
* Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "via-core.h"
+
+#include <linux/via-core.h>
#include "global.h"
static struct pll_map pll_value[] = {
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 04eec31aa9a2..2ab0f156439a 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -18,8 +18,8 @@
* Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "via-core.h"
-#include "via_i2c.h"
+#include <linux/via-core.h>
+#include <linux/via_i2c.h>
#include "global.h"
#include "lcdtbl.h"
diff --git a/drivers/video/via/via-core.c b/drivers/video/via/via-core.c
index 188c0022dcb4..e8cfe8392110 100644
--- a/drivers/video/via/via-core.c
+++ b/drivers/video/via/via-core.c
@@ -7,9 +7,9 @@
/*
* Core code for the Via multifunction framebuffer device.
*/
-#include "via-core.h"
-#include "via_i2c.h"
-#include "via-gpio.h"
+#include <linux/via-core.h>
+#include <linux/via_i2c.h>
+#include <linux/via-gpio.h>
#include "global.h"
#include <linux/module.h>
diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
index 67d699cbfd2c..595516aea691 100644
--- a/drivers/video/via/via-gpio.c
+++ b/drivers/video/via/via-gpio.c
@@ -8,8 +8,8 @@
#include <linux/spinlock.h>
#include <linux/gpio.h>
#include <linux/platform_device.h>
-#include "via-core.h"
-#include "via-gpio.h"
+#include <linux/via-core.h>
+#include <linux/via-gpio.h>
/*
* The ports we know about. Note that the port-25 gpios are not
diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
index 2291765f2f8e..da9e4ca94b17 100644
--- a/drivers/video/via/via_i2c.c
+++ b/drivers/video/via/via_i2c.c
@@ -23,8 +23,8 @@
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/module.h>
-#include "via-core.h"
-#include "via_i2c.h"
+#include <linux/via-core.h>
+#include <linux/via_i2c.h>
/*
* There can only be one set of these, so there's no point in having
diff --git a/drivers/video/via/via_modesetting.c b/drivers/video/via/via_modesetting.c
index b4e735cc350e..3cddcff88ab9 100644
--- a/drivers/video/via/via_modesetting.c
+++ b/drivers/video/via/via_modesetting.c
@@ -24,8 +24,8 @@
*/
#include <linux/kernel.h>
+#include <linux/via-core.h>
#include "via_modesetting.h"
-#include "via-core.h"
#include "share.h"
#include "debug.h"
diff --git a/drivers/video/via/via_utility.c b/drivers/video/via/via_utility.c
index 575703141868..d05ccb62b55f 100644
--- a/drivers/video/via/via_utility.c
+++ b/drivers/video/via/via_utility.c
@@ -19,7 +19,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "via-core.h"
+#include <linux/via-core.h>
#include "global.h"
void viafb_get_device_support_state(u32 *support_state)
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 3d033186a822..d3dd2eb95586 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -22,9 +22,9 @@
#include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-#define _MASTER_FILE
+#include <linux/via-core.h>
-#include "via-core.h"
+#define _MASTER_FILE
#include "global.h"
static char *viafb_name = "Via";
diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c
index 2fdb9e6724a4..2dbad3c0f679 100644
--- a/drivers/video/via/viamode.c
+++ b/drivers/video/via/viamode.c
@@ -19,7 +19,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "via-core.h"
+#include <linux/via-core.h>
#include "global.h"
struct res_map_refresh res_map_refresh_tbl[] = {
/*hres, vres, vclock, vmode_refresh*/
diff --git a/drivers/video/via/vt1636.c b/drivers/video/via/vt1636.c
index e5f802472883..d65bf1aee87c 100644
--- a/drivers/video/via/vt1636.c
+++ b/drivers/video/via/vt1636.c
@@ -19,8 +19,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "via-core.h"
-#include "via_i2c.h"
+#include <linux/via-core.h>
+#include <linux/via_i2c.h>
#include "global.h"
u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
diff --git a/drivers/video/via/via-core.h b/include/linux/via-core.h
index 7ffb521e1a7a..7ffb521e1a7a 100644
--- a/drivers/video/via/via-core.h
+++ b/include/linux/via-core.h
diff --git a/drivers/video/via/via-gpio.h b/include/linux/via-gpio.h
index 8281aea3dd6d..8281aea3dd6d 100644
--- a/drivers/video/via/via-gpio.h
+++ b/include/linux/via-gpio.h
diff --git a/drivers/video/via/via_i2c.h b/include/linux/via_i2c.h
index 44532e468c05..44532e468c05 100644
--- a/drivers/video/via/via_i2c.h
+++ b/include/linux/via_i2c.h