diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
| commit | 5145edef1efa16e6947c27c7487fac545e8b5939 (patch) | |
| tree | 835d67bb642027c7abaa62246b450993d250a52f /arch/arm/mach-tegra/cpu-tegra.c | |
| parent | 451bdbef06b85c4e82538debfd7b295fa08fe501 (diff) | |
| parent | 5d9d49c51678f5e4c37ce661b4573d73fb391040 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Conflicts:
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci.h
Diffstat (limited to 'arch/arm/mach-tegra/cpu-tegra.c')
| -rw-r--r-- | arch/arm/mach-tegra/cpu-tegra.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c index 0e1016a827a..0e0fd4d889b 100644 --- a/arch/arm/mach-tegra/cpu-tegra.c +++ b/arch/arm/mach-tegra/cpu-tegra.c @@ -32,7 +32,6 @@ #include <asm/system.h> -#include <mach/hardware.h> #include <mach/clk.h> /* Frequency table index must be sequential starting at 0 */ |