From: Tony Lindgren <tony@atomide.com>
Date: Mon, 23 Oct 2006 14:04:31 +0000 (+0300)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.19-omap1~129
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=36808520ce2c9ade647d36c80004c158c71d0510;p=linux-2.6-omap-h63xx.git

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

36808520ce2c9ade647d36c80004c158c71d0510
diff --cc arch/arm/boot/compressed/Makefile
index 1a0ea5d381c,adddc713168..6bebde52d40
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@@ -50,12 -50,12 +50,16 @@@ ifeq ($(CONFIG_ARCH_AT91RM9200),y
  OBJS		+= head-at91rm9200.o
  endif
  
 +ifeq ($(CONFIG_MACH_OMAP_PERSEUS2),y)
 +OBJS		+= head-omap.o
 +endif
 +
  ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
+ ifeq ($(CONFIG_CPU_CP15),y)
  OBJS		+= big-endian.o
+ else
+ # The endian should be set by h/w design.
+ endif
  endif
  
  #
diff --cc drivers/char/Makefile
index eb6f9920887,777cad04509..d366d73cb1c
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -65,9 -68,7 +68,8 @@@ obj-$(CONFIG_GEN_RTC)		+= genrtc.
  obj-$(CONFIG_EFI_RTC)		+= efirtc.o
  obj-$(CONFIG_SGI_DS1286)	+= ds1286.o
  obj-$(CONFIG_SGI_IP27_RTC)	+= ip27-rtc.o
 +obj-$(CONFIG_OMAP_RTC)		+= omap-rtc.o
  obj-$(CONFIG_DS1302)		+= ds1302.o
- obj-$(CONFIG_S3C2410_RTC)	+= s3c2410-rtc.o
  ifeq ($(CONFIG_GENERIC_NVRAM),y)
    obj-$(CONFIG_NVRAM)	+= generic_nvram.o
  else
diff --cc drivers/input/touchscreen/ads7846.c
index cf4ae0af030,f56d6a0f062..87014aa0b5f
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@@ -588,10 -485,9 +588,10 @@@ static int ads7846_timer(struct hrtime
  	}
  
  	spin_unlock_irq(&ts->lock);
 +	return HRTIMER_NORESTART;
  }
  
- static irqreturn_t ads7846_irq(int irq, void *handle, struct pt_regs *regs)
+ static irqreturn_t ads7846_irq(int irq, void *handle)
  {
  	struct ads7846 *ts = handle;
  	unsigned long flags;
diff --cc drivers/media/video/Makefile
index ca2802fc682,af57abce8a6..49bd082b26c
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@@ -68,11 -86,8 +86,9 @@@ obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.
  obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
  
  obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
 +obj-$(CONFIG_VIDEO_OMAP_CAMERA) += omap/
  
  obj-$(CONFIG_VIDEO_CX25840) += cx25840/
- obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
- obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
  obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
  obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
  obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
diff --cc drivers/usb/gadget/omap_udc.c
index 5a00911e2c6,48a09fd89d1..80aa0e2fe9a
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@@ -40,9 -40,8 +40,9 @@@
  #include <linux/platform_device.h>
  #include <linux/usb_ch9.h>
  #include <linux/usb_gadget.h>
- #include <linux/usb_otg.h>
+ #include <linux/usb/otg.h>
  #include <linux/dma-mapping.h>
 +#include <linux/clk.h>
  
  #include <asm/byteorder.h>
  #include <asm/io.h>
diff --cc drivers/video/Kconfig
index 0a0e54465be,7a43020fa58..8de5d597438
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -1601,12 -1628,10 +1628,13 @@@ config FB_VIRTUA
  	  kernel option `video=vfb:'.
  
  	  To compile this driver as a module, choose M here: the
- 	  module will be called vfb.
+ 	  module will be called vfb. In order to load it, you must use
+ 	  the vfb_enable=1 option.
  
  	  If unsure, say N.
 +
 +source "drivers/video/omap/Kconfig"
 +
  if VT
  	source "drivers/video/console/Kconfig"
  endif