diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 |
commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /sound/soc/omap/am3517evm.c | |
parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
download | linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.bz2 |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'sound/soc/omap/am3517evm.c')
-rw-r--r-- | sound/soc/omap/am3517evm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index fad350682ca2..c1900b2a6f28 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c @@ -25,8 +25,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap-mcbsp.h" |