From: Tony Lindgren <tony@atomide.com>
Date: Fri, 28 Apr 2006 07:28:12 +0000 (-0700)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.17-omap1~100
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4f69cef4fb433472c59688bec827ff9dea32efa8;p=linux-2.6-omap-h63xx.git

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

4f69cef4fb433472c59688bec827ff9dea32efa8
diff --cc arch/arm/Makefile
index fe923006d96,6f8e84c1c1f..3da406c8e4e
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -63,10 -63,10 +63,10 @@@ tune-$(CONFIG_CPU_SA110)	:=-mtune=stron
  tune-$(CONFIG_CPU_SA1100)	:=-mtune=strongarm1100
  tune-$(CONFIG_CPU_XSCALE)	:=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
  tune-$(CONFIG_CPU_XSC3)		:=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
 -tune-$(CONFIG_CPU_V6)		:=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
 +tune-$(CONFIG_CPU_V6)		:=$(call cc-option,-mtune=arm1136j-s,-mtune=arm1136jfs)
  
  ifeq ($(CONFIG_AEABI),y)
- CFLAGS_ABI	:=-mabi=aapcs -mno-thumb-interwork
+ CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork
  else
  CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
  endif
diff --cc drivers/char/Makefile
index 0320635d465,f5b01c6d498..8d4a36e947d
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -65,10 -65,8 +65,9 @@@ 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
- obj-$(CONFIG_RTC_VR41XX)	+= vr41xx_rtc.o
  ifeq ($(CONFIG_GENERIC_NVRAM),y)
    obj-$(CONFIG_NVRAM)	+= generic_nvram.o
  else