diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-06-13 10:24:38 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-06-13 10:24:38 +0200 |
| commit | 289733ed456f7c1cbdb1f1ca58312f77c239953b (patch) | |
| tree | 99bed0a5c21d0bdc5f6c10bc80a1ae8dbbd56be6 /drivers/amba/Makefile | |
| parent | OMAPDSS: fix registration of DPI and SDI devices (diff) | |
| parent | Linux 3.5-rc2 (diff) | |
| download | linux-289733ed456f7c1cbdb1f1ca58312f77c239953b.tar.xz linux-289733ed456f7c1cbdb1f1ca58312f77c239953b.zip | |
Merge tag 'v3.5-rc2'
Merge v3.5-rc2 to get latest device tree and dynamic debug changes.
Diffstat (limited to 'drivers/amba/Makefile')
| -rw-r--r-- | drivers/amba/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/amba/Makefile b/drivers/amba/Makefile index 40fe74097be2..66e81c2f1e3c 100644 --- a/drivers/amba/Makefile +++ b/drivers/amba/Makefile @@ -1,2 +1,2 @@ -obj-y += bus.o - +obj-$(CONFIG_ARM_AMBA) += bus.o +obj-$(CONFIG_TEGRA_AHB) += tegra-ahb.o |