diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 22:53:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 13:30:41 +0200 |
| commit | 21b7f153dd0d7366197c37e7a630c7585db0b8ea (patch) | |
| tree | 065ad22312b08aca338479a823d60bec23fde120 /drivers/Makefile | |
| parent | 0200c0a66cb727fae13bcd938d44a0841a6530d1 (diff) | |
| parent | 89c788bab1f0374ae05aef7560066442ceb55384 (diff) | |
| download | op-kernel-dev-21b7f153dd0d7366197c37e7a630c7585db0b8ea.zip op-kernel-dev-21b7f153dd0d7366197c37e7a630c7585db0b8ea.tar.gz | |
Merge branch 'for-3.5/ahb' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/drivers
* tegra/ahb:
ARM: tegra: Add SMMU enabler in AHB
ARM: tegra: Add Tegra AHB driver
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 95952c8..fd71763 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_SFI) += sfi/ # PnP must come after ACPI since it will eventually need to check if acpi # was used and do nothing if so obj-$(CONFIG_PNP) += pnp/ -obj-$(CONFIG_ARM_AMBA) += amba/ +obj-y += amba/ # Many drivers will want to use DMA so this has to be made available # really early. obj-$(CONFIG_DMA_ENGINE) += dma/ |
