diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 08:58:23 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 08:58:23 -0500 |
| commit | 3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch) | |
| tree | 708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/sh | |
| parent | a193436c5d52e8398af22462beaa03407fa89b2e (diff) | |
| parent | 7bd1fd8a96098b84664acdca5361defaf1e6ce9f (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/migor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index df13338cb3e2..6088a6a3238a 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c | |||
| @@ -8,11 +8,11 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/clkdev.h> | ||
| 11 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 12 | #include <linux/firmware.h> | 13 | #include <linux/firmware.h> |
| 13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 14 | 15 | ||
| 15 | #include <asm/clkdev.h> | ||
| 16 | #include <asm/clock.h> | 16 | #include <asm/clock.h> |
| 17 | 17 | ||
| 18 | #include <cpu/sh7722.h> | 18 | #include <cpu/sh7722.h> |