diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:05:50 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:05:50 -0400 |
| commit | 698158c799c7961824ccdb773250e16c0dd5d9e4 (patch) | |
| tree | 96f034be9e9a95e6f68b5d20d1a3df7a3cbf724a /arch/arm/mach-sa1100/clock.c | |
| parent | 4c7827eec78abe6fe68fd29305806467f2a51e63 (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
Merge ../linux-2.6
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, |