From: Dmitry Torokhov <dtor@insightbb.com>
Date: Tue, 1 May 2007 04:24:54 +0000 (-0400)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: upstream/snapshot3+hdmi~33184^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c
---

bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775
diff --cc arch/mips/cobalt/Makefile
index c35ee25,de017c1..9565b21
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@@ -2,8 -2,8 +2,8 @@@
  # Makefile for the Cobalt micro systems family specific parts of the kernel
  #
  
 -obj-y	 := irq.o reset.o setup.o
 +obj-y	 := irq.o reset.o setup.o buttons.o
  
+ obj-$(CONFIG_PCI)		+= pci.o
  obj-$(CONFIG_EARLY_PRINTK)	+= console.o
- 
- EXTRA_AFLAGS := $(CFLAGS)
+ obj-$(CONFIG_MTD_PHYSMAP)	+= mtd.o
diff --cc drivers/usb/input/Makefile
index f8c35b6,9bf420e..284a073
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@@ -33,11 -8,11 +8,8 @@@ wacom-objs	:= wacom_wac.o wacom_sys.
  obj-$(CONFIG_USB_AIPTEK)	+= aiptek.o
  obj-$(CONFIG_USB_ATI_REMOTE)	+= ati_remote.o
  obj-$(CONFIG_USB_ATI_REMOTE2)	+= ati_remote2.o
- obj-$(CONFIG_USB_HID)		+= usbhid.o
- obj-$(CONFIG_USB_KBD)		+= usbkbd.o
  obj-$(CONFIG_USB_KBTAB)		+= kbtab.o
  obj-$(CONFIG_USB_KEYSPAN_REMOTE)	+= keyspan_remote.o
- obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
 -obj-$(CONFIG_USB_MTOUCH)	+= mtouchusb.o
 -obj-$(CONFIG_USB_ITMTOUCH)	+= itmtouch.o
 -obj-$(CONFIG_USB_EGALAX)	+= touchkitusb.o
  obj-$(CONFIG_USB_TOUCHSCREEN)	+= usbtouchscreen.o
  obj-$(CONFIG_USB_POWERMATE)	+= powermate.o
  obj-$(CONFIG_USB_WACOM)		+= wacom.o
@@@ -45,7 -20,7 +17,7 @@@ obj-$(CONFIG_USB_ACECAD)	+= acecad.
  obj-$(CONFIG_USB_YEALINK)	+= yealink.o
  obj-$(CONFIG_USB_XPAD)		+= xpad.o
  obj-$(CONFIG_USB_APPLETOUCH)	+= appletouch.o
--obj-$(CONFIG_USB_GTCO)         += gtco.o
++obj-$(CONFIG_USB_GTCO)		+= gtco.o
  
  ifeq ($(CONFIG_USB_DEBUG),y)
  EXTRA_CFLAGS += -DDEBUG
diff --cc drivers/usb/input/gtco.c
index dbd207e,ae756e0..b2ca10f2f
--- a/drivers/usb/input/gtco.c
+++ b/drivers/usb/input/gtco.c
@@@ -223,10 -225,11 +223,10 @@@ static void parse_hid_report_descriptor
  	__u32 oldval[TAG_GLOB_MAX];
  
  	/* Debug stuff */
--	char  maintype='x';
++	char  maintype = 'x';
  	char  globtype[12];
 -	int   indent=0;
 -	char  indentstr[10]="";
 -
 +	int   indent = 0;
 +	char  indentstr[10] = "";
  
  
  	dbg("======>>>>>>PARSE<<<<<<======");