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, 0 insertions, 12 deletions

diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 92d923c7f360..3a98f1399495 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -314,20 +314,8 @@ static int vidioc_log_status(struct file *file, void *priv)
         return 0;
 }
 
-static int typhoon_open(struct file *file)
-{
-        return 0;
-}
-
-static int typhoon_release(struct file *file)
-{
-        return 0;
-}
-
 static const struct v4l2_file_operations typhoon_fops = {
         .owner          = THIS_MODULE,
-        .open           = typhoon_open,
-        .release        = typhoon_release,
         .ioctl          = video_ioctl2,
 };