diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 11:03:35 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 11:03:35 -0400 |
| commit | 2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9 (patch) | |
| tree | ef49d741211dcc4f38636b5c422c9c346da09adf /arch/arm/mach-tegra | |
| parent | 5762c20593b6b959f1470dc6f1ff4ca4d9570f8d (diff) | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
Merge commit 'v3.1' into devicetree/next
Diffstat (limited to 'arch/arm/mach-tegra')
| -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 0e1016a827ac..0e0fd4d889bd 100644 --- a/arch/arm/mach-tegra/cpu-tegra.c +++ b/arch/arm/mach-tegra/cpu-tegra.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <asm/system.h> | 33 | #include <asm/system.h> |
| 34 | 34 | ||
| 35 | #include <mach/hardware.h> | ||
| 36 | #include <mach/clk.h> | 35 | #include <mach/clk.h> |
| 37 | 36 | ||
| 38 | /* Frequency table index must be sequential starting at 0 */ | 37 | /* Frequency table index must be sequential starting at 0 */ |