Merge commit 'v2.6.30-rc1' into perfcounters/core

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 873c30a41bd7..97b003449c91 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -219,18 +219,19 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
         return 0;
 }
 
-static int adv7170_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int adv7170_s_routing(struct v4l2_subdev *sd,
+                             u32 input, u32 output, u32 config)
 {
         struct adv7170 *encoder = to_adv7170(sd);
 
-        /* RJ: route->input = 0: input is from decoder
-           route->input = 1: input is from ZR36060
-           route->input = 2: color bar */
+        /* RJ: input = 0: input is from decoder
+           input = 1: input is from ZR36060
+           input = 2: color bar */
 
         v4l2_dbg(1, debug, sd, "set input from %s\n",
-                        route->input == 0 ? "decoder" : "ZR36060");
+                        input == 0 ? "decoder" : "ZR36060");
 
-        switch (route->input) {
+        switch (input) {
         case 0:
                 adv7170_write(sd, 0x01, 0x20);
                 adv7170_write(sd, 0x08, TR1CAPT);       /* TR1 */
@@ -250,11 +251,11 @@ static int adv7170_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *
                 break;
 
         default:
-                v4l2_dbg(1, debug, sd, "illegal input: %d\n", route->input);
+                v4l2_dbg(1, debug, sd, "illegal input: %d\n", input);
                 return -EINVAL;
         }
-        v4l2_dbg(1, debug, sd, "switched to %s\n", inputs[route->input]);
-        encoder->input = route->input;
+        v4l2_dbg(1, debug, sd, "switched to %s\n", inputs[input]);
+        encoder->input = input;
         return 0;
 }