diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 15:53:43 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 15:53:43 +0100 |
commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /arch/arm/mach-lh7a40x/clocks.c | |
parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'arch/arm/mach-lh7a40x/clocks.c')
-rw-r--r-- | arch/arm/mach-lh7a40x/clocks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-lh7a40x/clocks.c b/arch/arm/mach-lh7a40x/clocks.c index fcaf876f19b6..0651f96653f9 100644 --- a/arch/arm/mach-lh7a40x/clocks.c +++ b/arch/arm/mach-lh7a40x/clocks.c @@ -10,6 +10,8 @@ #include <mach/hardware.h> #include <mach/clocks.h> #include <linux/err.h> +#include <linux/device.h> +#include <linux/string.h> struct module; |