From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 16 Aug 2010 04:32:24 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/include/asm/Kbuild
	drivers/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301
diff --cc arch/sh/include/asm/Kbuild
index b4d3462f1dc3,0eed47b236ab..7beb42322f60
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@@ -3,10 -3,7 +3,9 @@@ include include/asm-generic/Kbuild.as
  header-y += cachectl.h
  header-y += cpu-features.h
  header-y += hw_breakpoint.h
- 
- unifdef-y += unistd_32.h
- unifdef-y += unistd_64.h
- unifdef-y += posix_types_32.h
- unifdef-y += posix_types_64.h
- unifdef-y += ptrace_32.h
- unifdef-y += ptrace_64.h
+ header-y += posix_types_32.h
+ header-y += posix_types_64.h
++header-y += ptrace_32.h
++header-y += ptrace_64.h
+ header-y += unistd_32.h
+ header-y += unistd_64.h
diff --cc drivers/Makefile
index b713e75cee71,ae473445ad6d..0861aa554dfd
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -102,7 -101,10 +102,9 @@@ obj-y				+= firmware
  obj-$(CONFIG_CRYPTO)		+= crypto/
  obj-$(CONFIG_SUPERH)		+= sh/
  obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/
- obj-$(CONFIG_GENERIC_TIME)	+= clocksource/
+ ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
+ obj-y				+= clocksource/
+ endif
 -obj-$(CONFIG_DMA_ENGINE)	+= dma/
  obj-$(CONFIG_DCA)		+= dca/
  obj-$(CONFIG_HID)		+= hid/
  obj-$(CONFIG_PPC_PS3)		+= ps3/