diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:31:07 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:31:07 +0000 |
commit | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch) | |
tree | a434977a6caa9b41cc0daaf71dbd76ac8693aba6 /drivers/Makefile | |
parent | b93a4afcff7be859e30cad2a305731516057d6cf (diff) | |
parent | 17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/Makefile')
-rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 6ee53c7a57a..e94cb1b7963 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -99,6 +99,7 @@ obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ +obj-$(CONFIG_ARCH_SHMOBILE) += sh/ obj-$(CONFIG_GENERIC_TIME) += clocksource/ obj-$(CONFIG_DMA_ENGINE) += dma/ obj-$(CONFIG_DCA) += dca/ |