diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 14:38:25 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 14:38:25 -0700 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /sound/soc/omap/zoom2.c | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
| download | op-kernel-dev-0ada0a73120c28cc432bcdbac061781465c2f48f.zip op-kernel-dev-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.gz | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'sound/soc/omap/zoom2.c')
| -rw-r--r-- | sound/soc/omap/zoom2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index f90b45f..f90a2ac 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -29,7 +29,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> #include <mach/gpio.h> -#include <mach/mcbsp.h> +#include <plat/mcbsp.h> #include "omap-mcbsp.h" #include "omap-pcm.h" |
