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, 2 deletions

diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 3b08bc4af90..f59b2bd07e8 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -3440,7 +3440,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         if (!cam)
                 return -ENOMEM;
 
-        err = v4l2_device_register(&udev->dev, &cam->v4l2_dev);
+        err = v4l2_device_register(&intf->dev, &cam->v4l2_dev);
         if (err)
                 goto fail0;
 
@@ -3523,7 +3523,8 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         w9968cf_turn_on_led(cam);
 
         w9968cf_i2c_init(cam);
-        cam->sensor_sd = v4l2_i2c_new_probed_subdev(&cam->i2c_adapter,
+        cam->sensor_sd = v4l2_i2c_new_probed_subdev(&cam->v4l2_dev,
+                        &cam->i2c_adapter,
                         "ovcamchip", "ovcamchip", addrs);
 
         usb_set_intfdata(intf, cam);