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/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 404f70eeb355..493cad941460 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -625,10 +625,10 @@ void saa7134_set_tvnorm_hw(struct saa7134_dev *dev)
         saa7134_set_decoder(dev);
 
         if (card_in(dev, dev->ctl_input).tv)
-                saa_call_all(dev, tuner, s_std, dev->tvnorm->id);
+                saa_call_all(dev, core, s_std, dev->tvnorm->id);
         /* Set the correct norm for the saa6752hs. This function
            does nothing if there is no saa6752hs. */
-        saa_call_empress(dev, tuner, s_std, dev->tvnorm->id);
+        saa_call_empress(dev, core, s_std, dev->tvnorm->id);
 }
 
 static void set_h_prescale(struct saa7134_dev *dev, int task, int prescale)
@@ -1496,7 +1496,7 @@ static int video_release(struct file *file)
         saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0);
         saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0);
 
-        saa_call_all(dev, core, s_standby, 0);
+        saa_call_all(dev, tuner, s_standby);
         if (fh->radio)
                 saa_call_all(dev, core, ioctl, RDS_CMD_CLOSE, &cmd);