Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Mon, 16 Aug 2010 04:32:24 +0000 (13:32 +0900)]
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile

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

1  2 
arch/sh/Kconfig
arch/sh/include/asm/Kbuild
drivers/Makefile
drivers/i2c/busses/i2c-sh_mobile.c
drivers/serial/sh-sci.h

diff --cc arch/sh/Kconfig
Simple merge
@@@ -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
@@@ -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/
Simple merge
Simple merge