diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:49:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:49:02 -0700 |
| commit | 0bbf211975addc2963b63a41a2eac99928365996 (patch) | |
| tree | 31e830db386e76a53db1b2248dc503be43126924 /arch/arm/mach-tegra/Makefile | |
| parent | 51e8703bdf12e2481b205096c973a3ab6a8ca18b (diff) | |
| parent | d5fdafd38ca0c28c4648909ce0afd0a5420309ca (diff) | |
| download | op-kernel-dev-0bbf211975addc2963b63a41a2eac99928365996.zip op-kernel-dev-0bbf211975addc2963b63a41a2eac99928365996.tar.gz | |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra: (61 commits)
ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice
ARM: tegra: add PCI Express power gating
ARM: tegra: PCIE minor code refactoring
ARM: Tegra: DMA: Fail safe if initialization fails
ARM: Tegra: Rename clk_dev1/2 to cdev1/2
ARM: Tegra: Rename I2S clocks to match driver name
ARM: Tegra: Make tegra_dma_init a postcore_initcall
ARM: tegra: add seaboard, wario and kaen boards
ARM: tegra: harmony: fix pinmux for MMC slot
ARM: tegra: harmony: register sdhci devices
ARM: tegra: remove stale nvidia atag handler
ARM: tegra: common device resources
ARM: tegra: harmony: move over to tegra_gpio_config
ARM: tegra: add tegra_gpio_table and tegra_gpio_config
ARM: tegra: Hide EMC scaling config behind ARCH_TEGRA
ARM: tegra: Fix typo in TEGRA_IRQ_TO_GPIO
ARM: tegra: common: Enable core clocks
ARM: tegra: timer: Enable timer and rtc clocks
ARM: tegra: Move tegra_common_init to tegra_init_early
ARM: tegra: clock: prevent accidental disables of cpu clock
...
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index cdbc68e..9bf39fa 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -1,14 +1,16 @@ obj-y += common.o +obj-y += devices.o obj-y += io.o obj-y += irq.o legacy_irq.o obj-y += clock.o obj-y += timer.o obj-y += gpio.o obj-y += pinmux.o +obj-y += powergate.o obj-y += fuse.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += clock.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o -obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_dvfs.o +obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-t2-tables.o obj-$(CONFIG_SMP) += platsmp.o localtimer.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o @@ -19,3 +21,9 @@ obj-$(CONFIG_TEGRA_PCI) += pcie.o obj-${CONFIG_MACH_HARMONY} += board-harmony.o obj-${CONFIG_MACH_HARMONY} += board-harmony-pinmux.o obj-${CONFIG_MACH_HARMONY} += board-harmony-pcie.o + +obj-${CONFIG_MACH_SEABOARD} += board-seaboard.o +obj-${CONFIG_MACH_SEABOARD} += board-seaboard-pinmux.o + +obj-${CONFIG_MACH_TRIMSLICE} += board-trimslice.o +obj-${CONFIG_MACH_TRIMSLICE} += board-trimslice-pinmux.o |
