Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index 4d3139e2099d..b4d7f63deff1 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -148,9 +148,10 @@ unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr)
         struct h3600_dev *ts = input_get_drvdata(dev);
 
         /* Must be in this order */
-        ts->serio->write(ts->serio, 1);
-        ts->serio->write(ts->serio, pwr);
-        ts->serio->write(ts->serio, brightness);
+        serio_write(ts->serio, 1);
+        serio_write(ts->serio, pwr);
+        serio_write(ts->serio, brightness);
+
         return 0;
 }
 
@@ -262,7 +263,7 @@ static int h3600ts_event(struct input_dev *dev, unsigned int type,
 
         switch (type) {
                 case EV_LED: {
-                //      ts->serio->write(ts->serio, SOME_CMD);
+                //      serio_write(ts->serio, SOME_CMD);
                         return 0;
                 }
         }