summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-13 13:58:23 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-13 13:58:23 +0000
commit3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch)
tree708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/sh
parenta193436c5d52e8398af22462beaa03407fa89b2e (diff)
parent7bd1fd8a96098b84664acdca5361defaf1e6ce9f (diff)
downloadop-kernel-dev-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.zip
op-kernel-dev-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.gz
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/migor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
index df13338..6088a6a 100644
--- a/sound/soc/sh/migor.c
+++ b/sound/soc/sh/migor.c
@@ -8,11 +8,11 @@
* published by the Free Software Foundation.
*/
+#include <linux/clkdev.h>
#include <linux/device.h>
#include <linux/firmware.h>
#include <linux/module.h>
-#include <asm/clkdev.h>
#include <asm/clock.h>
#include <cpu/sh7722.h>
OpenPOWER on IntegriCloud