aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2010-05-05 16:44:55 -0400
committerJonathan Corbet <corbet@lwn.net>2010-05-11 18:07:59 -0400
commitec66841e495b9ab4f92bdf91efe8cf56e1471fbd (patch)
treeaee3762a85c20c87858bdcc5e3d2143dcec47058
parent9221fc6556d6fa14b5c61050dd87e26fc4ad255c (diff)
viafb: move some include files to include/linux
These are the files which should be available to subdevices compiled outside of drivers/video/via. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte <laforge@gnumonks.org> Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-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 @@
18 * Foundation, Inc., 18 * Foundation, Inc.,
19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 */ 20 */
21#include "via-core.h" 21#include <linux/via-core.h>
22#include "global.h" 22#include "global.h"
23 23
24/* 24/*
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 @@
18 * Foundation, Inc., 18 * Foundation, Inc.,
19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 */ 20 */
21#include "via-core.h" 21#include <linux/via-core.h>
22#include "via_i2c.h" 22#include <linux/via_i2c.h>
23#include "global.h" 23#include "global.h"
24 24
25static void tmds_register_write(int index, u8 data); 25static 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 @@
18 * Foundation, Inc., 18 * Foundation, Inc.,
19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 */ 20 */
21#include "via-core.h" 21
22#include <linux/via-core.h>
22#include "global.h" 23#include "global.h"
23 24
24static struct pll_map pll_value[] = { 25static 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 @@
18 * Foundation, Inc., 18 * Foundation, Inc.,
19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 */ 20 */
21#include "via-core.h" 21#include <linux/via-core.h>
22#include "via_i2c.h" 22#include <linux/via_i2c.h>
23#include "global.h" 23#include "global.h"
24#include "lcdtbl.h" 24#include "lcdtbl.h"
25 25
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 @@
7/* 7/*
8 * Core code for the Via multifunction framebuffer device. 8 * Core code for the Via multifunction framebuffer device.
9 */ 9 */
10#include "via-core.h" 10#include <linux/via-core.h>
11#include "via_i2c.h" 11#include <linux/via_i2c.h>
12#include "via-gpio.h" 12#include <linux/via-gpio.h>
13#include "global.h" 13#include "global.h"
14 14
15#include <linux/module.h> 15#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 @@
8#include <linux/spinlock.h> 8#include <linux/spinlock.h>
9#include <linux/gpio.h> 9#include <linux/gpio.h>
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include "via-core.h" 11#include <linux/via-core.h>
12#include "via-gpio.h" 12#include <linux/via-gpio.h>
13 13
14/* 14/*
15 * The ports we know about. Note that the port-25 gpios are not 15 * 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 @@
23#include <linux/delay.h> 23#include <linux/delay.h>
24#include <linux/spinlock.h> 24#include <linux/spinlock.h>
25#include <linux/module.h> 25#include <linux/module.h>
26#include "via-core.h" 26#include <linux/via-core.h>
27#include "via_i2c.h" 27#include <linux/via_i2c.h>
28 28
29/* 29/*
30 * There can only be one set of these, so there's no point in having 30 * 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 @@
24 */ 24 */
25 25
26#include <linux/kernel.h> 26#include <linux/kernel.h>
27#include <linux/via-core.h>
27#include "via_modesetting.h" 28#include "via_modesetting.h"
28#include "via-core.h"
29#include "share.h" 29#include "share.h"
30#include "debug.h" 30#include "debug.h"
31 31
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 @@
19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 */ 20 */
21 21
22#include "via-core.h" 22#include <linux/via-core.h>
23#include "global.h" 23#include "global.h"
24 24
25void viafb_get_device_support_state(u32 *support_state) 25void 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 @@
22#include <linux/module.h> 22#include <linux/module.h>
23#include <linux/seq_file.h> 23#include <linux/seq_file.h>
24#include <linux/stat.h> 24#include <linux/stat.h>
25#define _MASTER_FILE 25#include <linux/via-core.h>
26 26
27#include "via-core.h" 27#define _MASTER_FILE
28#include "global.h" 28#include "global.h"
29 29
30static char *viafb_name = "Via"; 30static 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 @@
19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 */ 20 */
21 21
22#include "via-core.h" 22#include <linux/via-core.h>
23#include "global.h" 23#include "global.h"
24struct res_map_refresh res_map_refresh_tbl[] = { 24struct res_map_refresh res_map_refresh_tbl[] = {
25/*hres, vres, vclock, vmode_refresh*/ 25/*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 @@
19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20 */ 20 */
21 21
22#include "via-core.h" 22#include <linux/via-core.h>
23#include "via_i2c.h" 23#include <linux/via_i2c.h>
24#include "global.h" 24#include "global.h"
25 25
26u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information 26u8 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