3 files changed, 3 insertions, 16 deletions

diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index cce26576999e..337c01c4ac37 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -284,21 +284,9 @@ static struct pxaficp_platform_data corgi_ficp_platform_data = {
 /*
  * USB Device Controller
  */
-static void corgi_udc_command(int cmd)
-{
-        switch(cmd)     {
-        case PXA2XX_UDC_CMD_CONNECT:
-                GPSR(CORGI_GPIO_USB_PULLUP) = GPIO_bit(CORGI_GPIO_USB_PULLUP);
-                break;
-        case PXA2XX_UDC_CMD_DISCONNECT:
-                GPCR(CORGI_GPIO_USB_PULLUP) = GPIO_bit(CORGI_GPIO_USB_PULLUP);
-                break;
-        }
-}
-
 static struct pxa2xx_udc_mach_info udc_info __initdata = {
         /* no connect GPIO; corgi can't tell connection status */
-        .udc_command            = corgi_udc_command,
+        .gpio_pullup            = CORGI_GPIO_USB_PULLUP,
 };
 
 
@@ -350,7 +338,6 @@ static void __init corgi_init(void)
         corgi_ssp_set_machinfo(&corgi_ssp_machinfo);
 
         pxa_gpio_mode(CORGI_GPIO_IR_ON | GPIO_OUT);
-        pxa_gpio_mode(CORGI_GPIO_USB_PULLUP | GPIO_OUT);
         pxa_gpio_mode(CORGI_GPIO_HSYNC | GPIO_IN);
 
         pxa_set_udc_info(&udc_info);
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 88a999df0ab3..591fc3187c7f 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -177,7 +177,7 @@ static void unmap_area_sections(unsigned long virt, unsigned long size)
                          * Free the page table, if there was one.
                          */
                         if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE)
-                                pte_free_kernel(pmd_page_kernel(pmd));
+                                pte_free_kernel(pmd_page_vaddr(pmd));
                 }
 
                 addr += PGDIR_SIZE;
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 9b815327b6a5..7e8096809be2 100644
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -26,7 +26,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/usb_otg.h>
+#include <linux/usb/otg.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>