diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:58:49 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:58:49 -0400 |
| commit | 9e3be1edbe5ca57df51140b523168237b3a01f4d (patch) | |
| tree | a72c0ec1ce0fbcdcd12ecb6aad9bedcc94b94f9d /arch/arm/mach-ux500/clock.c | |
| parent | ASoC: Fix SND_SOC_ALL_CODECS typo for alc5623 (diff) | |
| parent | Merge commit 'v2.6.37-rc1' into for-2.6.37 (diff) | |
| download | linux-dev-9e3be1edbe5ca57df51140b523168237b3a01f4d.tar.xz linux-dev-9e3be1edbe5ca57df51140b523168237b3a01f4d.zip | |
Merge branch 'for-2.6.37' into HEAD
WARN() fix from Joe moved.
Conflicts:
sound/soc/codecs/wm_hubs.c
Diffstat (limited to 'arch/arm/mach-ux500/clock.c')
| -rw-r--r-- | arch/arm/mach-ux500/clock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index d8ab7f184fe4..1675047daf20 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c @@ -477,6 +477,7 @@ static struct clk_lookup u8500_common_clks[] = { CLK(sdi5, "sdi5", NULL), CLK(uart2, "uart2", NULL), CLK(ske, "ske", NULL), + CLK(ske, "nmk-ske-keypad", NULL), CLK(sdi2, "sdi2", NULL), CLK(i2c0, "nmk-i2c.0", NULL), CLK(fsmc, "fsmc", NULL), |