From 2f1f649fbbfeac9424f3d0b08f02ad3d98fab51a Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Wed, 5 May 2010 14:24:18 -0600
Subject: [PATCH] --- yaml --- r: 193580 b: refs/heads/master c:
 9221fc6556d6fa14b5c61050dd87e26fc4ad255c h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/video/via/via-gpio.c | 1 -
 trunk/drivers/video/via/via_i2c.c  | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6859d708a38e..485bf013f526 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a28ea9cedaa673b8a1a7f84628d784d020f3b47
+refs/heads/master: 9221fc6556d6fa14b5c61050dd87e26fc4ad255c
diff --git a/trunk/drivers/video/via/via-gpio.c b/trunk/drivers/video/via/via-gpio.c
index 63cb7acc0faf..67d699cbfd2c 100644
--- a/trunk/drivers/video/via/via-gpio.c
+++ b/trunk/drivers/video/via/via-gpio.c
@@ -10,7 +10,6 @@
 #include <linux/platform_device.h>
 #include "via-core.h"
 #include "via-gpio.h"
-#include "global.h"
 
 /*
  * The ports we know about.  Note that the port-25 gpios are not
diff --git a/trunk/drivers/video/via/via_i2c.c b/trunk/drivers/video/via/via_i2c.c
index 84ec2d6e98c4..2291765f2f8e 100644
--- a/trunk/drivers/video/via/via_i2c.c
+++ b/trunk/drivers/video/via/via_i2c.c
@@ -20,9 +20,11 @@
  */
 
 #include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
 #include "via-core.h"
 #include "via_i2c.h"
-#include "global.h"
 
 /*
  * There can only be one set of these, so there's no point in having