diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-05 10:22:45 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-05 10:22:45 -0400 |
commit | 593d0a3e9f813db910dc50574532914db21d09ff (patch) | |
tree | 12d8413ee57b4383ca8c906996ffe02be6d377a5 /arch/arm/mach-tegra/Makefile | |
parent | 50e900417b8096939d12a46848f965e27a905e36 (diff) | |
parent | 4cb38750d49010ae72e718d46605ac9ba5a851b4 (diff) |
Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6
* commit '4cb38750d49010ae72e718d46605ac9ba5a851b4': (6849 commits)
bcma: fix invalid PMU chip control masks
[libata] pata_cmd64x: whitespace cleanup
libata-acpi: fix up for acpi_pm_device_sleep_state API
sata_dwc_460ex: device tree may specify dma_channel
ahci, trivial: fixed coding style issues related to braces
ahci_platform: add hibernation callbacks
libata-eh.c: local functions should not be exposed globally
libata-transport.c: local functions should not be exposed globally
sata_dwc_460ex: support hardreset
ata: use module_pci_driver
drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
[libata] Prevent interface errors with Seagate FreeAgent GoFlex
drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
libata-acpi: add missing inlines in libata.h
i2c-omap: Add support for I2C_M_STOP message flag
i2c: Fall back to emulated SMBus if the operation isn't supported natively
i2c: Add SCCB support
i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
...
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
-rw-r--r-- | arch/arm/mach-tegra/Makefile | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 2eb4445ddb14..c3d7303b9ac8 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile | |||
@@ -8,21 +8,24 @@ obj-y += timer.o | |||
8 | obj-y += fuse.o | 8 | obj-y += fuse.o |
9 | obj-y += pmc.o | 9 | obj-y += pmc.o |
10 | obj-y += flowctrl.o | 10 | obj-y += flowctrl.o |
11 | obj-y += powergate.o | ||
12 | obj-y += apbio.o | ||
11 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | 13 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o |
12 | obj-$(CONFIG_CPU_IDLE) += sleep.o | 14 | obj-$(CONFIG_CPU_IDLE) += sleep.o |
13 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += powergate.o | ||
14 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o | 15 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_clocks.o |
15 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o | 16 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o |
16 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o | ||
17 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o | 17 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o |
18 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o | 18 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o |
19 | obj-$(CONFIG_SMP) += reset.o | 19 | obj-$(CONFIG_SMP) += reset.o |
20 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | 20 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |
21 | obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o apbio.o | 21 | obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o |
22 | obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o | 22 | obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o |
23 | obj-$(CONFIG_TEGRA_PCI) += pcie.o | 23 | obj-$(CONFIG_TEGRA_PCI) += pcie.o |
24 | obj-$(CONFIG_USB_SUPPORT) += usb_phy.o | 24 | obj-$(CONFIG_USB_SUPPORT) += usb_phy.o |
25 | 25 | ||
26 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o | ||
27 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o | ||
28 | |||
26 | obj-$(CONFIG_MACH_HARMONY) += board-harmony.o | 29 | obj-$(CONFIG_MACH_HARMONY) += board-harmony.o |
27 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pinmux.o | 30 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pinmux.o |
28 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pcie.o | 31 | obj-$(CONFIG_MACH_HARMONY) += board-harmony-pcie.o |
@@ -31,14 +34,5 @@ obj-$(CONFIG_MACH_HARMONY) += board-harmony-power.o | |||
31 | obj-$(CONFIG_MACH_PAZ00) += board-paz00.o | 34 | obj-$(CONFIG_MACH_PAZ00) += board-paz00.o |
32 | obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o | 35 | obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o |
33 | 36 | ||
34 | obj-$(CONFIG_MACH_SEABOARD) += board-seaboard.o | ||
35 | obj-$(CONFIG_MACH_SEABOARD) += board-seaboard-pinmux.o | ||
36 | |||
37 | obj-$(CONFIG_MACH_TEGRA_DT) += board-dt-tegra20.o | ||
38 | obj-$(CONFIG_MACH_TEGRA_DT) += board-harmony-pinmux.o | ||
39 | obj-$(CONFIG_MACH_TEGRA_DT) += board-seaboard-pinmux.o | ||
40 | obj-$(CONFIG_MACH_TEGRA_DT) += board-paz00-pinmux.o | ||
41 | obj-$(CONFIG_MACH_TEGRA_DT) += board-trimslice-pinmux.o | ||
42 | |||
43 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o | 37 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice.o |
44 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o | 38 | obj-$(CONFIG_MACH_TRIMSLICE) += board-trimslice-pinmux.o |