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, 3 insertions, 3 deletions

diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index a655e9c30146..168bca703614 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -188,7 +188,7 @@ void msp3400c_set_mode(struct i2c_client *client, int mode)
 {
         struct msp_state *state = to_state(i2c_get_clientdata(client));
         struct msp3400c_init_data_dem *data = &msp3400c_init_data[mode];
-        int tuner = (state->routing.input >> 3) & 1;
+        int tuner = (state->route_in >> 3) & 1;
         int i;
 
         v4l_dbg(1, msp_debug, client, "set_mode: %d\n", mode);
@@ -896,7 +896,7 @@ static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)
 static void msp34xxg_set_sources(struct i2c_client *client)
 {
         struct msp_state *state = to_state(i2c_get_clientdata(client));
-        u32 in = state->routing.input;
+        u32 in = state->route_in;
 
         msp34xxg_set_source(client, 0x0008, (in >> 4) & 0xf);
         /* quasi-peak detector is set to same input as the loudspeaker (MAIN) */
@@ -912,7 +912,7 @@ static void msp34xxg_set_sources(struct i2c_client *client)
 static void msp34xxg_reset(struct i2c_client *client)
 {
         struct msp_state *state = to_state(i2c_get_clientdata(client));
-        int tuner = (state->routing.input >> 3) & 1;
+        int tuner = (state->route_in >> 3) & 1;
         int modus;
 
         /* initialize std to 1 (autodetect) to signal that no standard is