diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /arch/arm/mach-sa1100/clock.c | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'arch/arm/mach-sa1100/clock.c')
| -rw-r--r-- | arch/arm/mach-sa1100/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c index fc97fe57ee6f..b5809c51d13f 100644 --- a/arch/arm/mach-sa1100/clock.c +++ b/arch/arm/mach-sa1100/clock.c | |||
| @@ -103,7 +103,7 @@ static void clk_gpio27_disable(void) | |||
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | static struct clk clk_gpio27 = { | 105 | static struct clk clk_gpio27 = { |
| 106 | .name = "GPIO27_CLK", | 106 | .name = "SA1111_CLK", |
| 107 | .rate = 3686400, | 107 | .rate = 3686400, |
| 108 | .enable = clk_gpio27_enable, | 108 | .enable = clk_gpio27_enable, |
| 109 | .disable = clk_gpio27_disable, | 109 | .disable = clk_gpio27_disable, |