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

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

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

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index b713e75cee7..0861aa554df 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -102,7 +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_DCA)               += dca/
 obj-$(CONFIG_HID)               += hid/
 obj-$(CONFIG_PPC_PS3)           += ps3/