diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-12 08:51:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-01-12 08:51:40 -0500 |
| commit | a04b9f845164a745e8773d916d45b0ea1a67726d (patch) | |
| tree | 0b1dffe5fce123180bff7d66c2cb000ab72d7123 /arch/arm/mach-imx/clock.c | |
| parent | 98007c230eb1e85ff5d49b4a697835680483dafd (diff) | |
| parent | da17490c0d4f9fd38761e6a7e95ac0bbd9f45ad9 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-imx/clock.c')
| -rw-r--r-- | arch/arm/mach-imx/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clock.c b/arch/arm/mach-imx/clock.c index 7ec60fc91565..cf332aeb942e 100644 --- a/arch/arm/mach-imx/clock.c +++ b/arch/arm/mach-imx/clock.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 25 | 25 | ||
| 26 | #include <mach/imx-regs.h> | 26 | #include <mach/hardware.h> |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * Very simple approach: We can't disable clocks, so we do | 29 | * Very simple approach: We can't disable clocks, so we do |