From: Tony Lindgren <tony@atomide.com>
Date: Fri, 22 Dec 2006 00:07:09 +0000 (-0800)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.21-omap1~205
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d8dd1185b8dc8c841f45fc17491afd9f418eb942;p=linux-2.6-omap-h63xx.git

Merge with /home/tmlind/src/kernel/linux-2.6
---

d8dd1185b8dc8c841f45fc17491afd9f418eb942
diff --cc arch/arm/mach-omap1/board-osk.c
index 15d913e98e2,7d0cf7af88c..969dec54223
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@@ -29,8 -29,8 +29,9 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/platform_device.h>
 +#include <linux/interrupt.h>
  #include <linux/irq.h>
+ #include <linux/interrupt.h>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
diff --cc drivers/usb/gadget/omap_udc.c
index 35e16919646,15d77c30793..91b3bb098d9
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@@ -2173,13 -2118,10 +2174,13 @@@ int usb_gadget_unregister_driver (struc
  
  	if (!udc)
  		return -ENODEV;
- 	if (!driver || driver != udc->driver)
+ 	if (!driver || driver != udc->driver || !driver->unbind)
  		return -EINVAL;
  
 -	if (machine_is_omap_innovator() || machine_is_omap_osk())
 +	if (udc->dc_clk != NULL)
 +		omap_udc_enable_clock(1);
 +
 +	if (machine_needs_vbus_session())
  		omap_vbus_session(&udc->gadget, 0);
  
  	if (udc->transceiver)
diff --cc include/asm-arm/setup.h
index bc8329fa4db,e5407392afc..42f00678b36
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@@ -128,19 -130,12 +130,19 @@@ struct tag_cmdline 
  #define ATAG_ACORN	0x41000101
  
  struct tag_acorn {
- 	u32 memc_control_reg;
- 	u32 vram_pages;
- 	u8 sounddefault;
- 	u8 adfsdrives;
+ 	__u32 memc_control_reg;
+ 	__u32 vram_pages;
+ 	__u8 sounddefault;
+ 	__u8 adfsdrives;
  };
  
 +/* TI OMAP specific information */
 +#define ATAG_BOARD       0x414f4d50
 +
 +struct tag_omap {
 +	u8 data[0];
 +};
 +
  /* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
  #define ATAG_MEMCLK	0x41000402