diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-19 05:34:07 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-19 05:34:07 +0400 |
| commit | 2879a927bb7a3cf91ae3906a5e59215f9c17dd75 (patch) | |
| tree | 870bdd1bd530a3d5d2abd10539700446b2878188 /sound/soc/davinci | |
| parent | 7e7b43892b87b6be259479ef4de14029dcb4012f (diff) | |
| parent | 20211e4d344729f4d4c93da37a590fc1c3a1fd9b (diff) | |
| download | linux-2879a927bb7a3cf91ae3906a5e59215f9c17dd75.tar.xz | |
Merge branch 'x86/oprofile' into oprofile
Diffstat (limited to 'sound/soc/davinci')
| -rw-r--r-- | sound/soc/davinci/davinci-evm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 5e2c306399ed..65fdbd81a379 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -19,9 +19,8 @@ #include <sound/soc.h> #include <sound/soc-dapm.h> -#include <asm/mach-types.h> #include <asm/dma.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include "../codecs/tlv320aic3x.h" #include "davinci-pcm.h" |