Index: linux-2.6.14/arch/arm/common/scoop.c
===================================================================
--- linux-2.6.14.orig/arch/arm/common/scoop.c	2005-11-12 22:47:01.000000000 +0000
+++ linux-2.6.14/arch/arm/common/scoop.c	2005-11-12 22:47:12.000000000 +0000
@@ -153,7 +153,7 @@
 	printk("Sharp Scoop Device found at 0x%08x -> 0x%08x\n",(unsigned int)mem->start,(unsigned int)devptr->base);
 
 	SCOOP_REG(devptr->base, SCOOP_MCR) = 0x0140;
-	reset_scoop(dev);
+	reset_scoop(&pdev->dev);
 	SCOOP_REG(devptr->base, SCOOP_GPCR) = inf->io_dir & 0xffff;
 	SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;
 
Index: linux-2.6.14/drivers/usb/gadget/dummy_hcd.c
===================================================================
--- linux-2.6.14.orig/drivers/usb/gadget/dummy_hcd.c	2005-11-12 22:47:01.000000000 +0000
+++ linux-2.6.14/drivers/usb/gadget/dummy_hcd.c	2005-11-12 22:47:12.000000000 +0000
@@ -944,7 +944,7 @@
 	set_link_state (dum);
 	spin_unlock_irq (&dum->lock);
 
-	dev->power.power_state = state;
+	dev->dev.power.power_state = state;
 	usb_hcd_poll_rh_status (dummy_to_hcd (dum));
 	return 0;
 }
@@ -1904,7 +1904,7 @@
 	struct usb_hcd		*hcd;
 	int			retval;
 
-	dev_info (dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
+	dev_info (&dev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
 
 	hcd = usb_create_hcd (&dummy_hcd, &dev->dev, dev->dev.bus_id);
 	if (!hcd)
Index: linux-2.6.14/drivers/video/w100fb.c
===================================================================
--- linux-2.6.14.orig/drivers/video/w100fb.c	2005-11-12 12:54:42.000000000 +0000
+++ linux-2.6.14/drivers/video/w100fb.c	2005-11-12 22:48:27.000000000 +0000
@@ -514,7 +514,7 @@
 	if (remapped_fbuf == NULL)
 		goto out;
 
-	info=framebuffer_alloc(sizeof(struct w100fb_par), dev);
+	info=framebuffer_alloc(sizeof(struct w100fb_par), &pdev->dev);
 	if (!info) {
 		err = -ENOMEM;
 		goto out;

