diff options
| author | Olof Johansson | 2012-09-17 19:35:22 -0700 |
|---|---|---|
| committer | Olof Johansson | 2012-09-18 17:45:42 -0700 |
| commit | b25c46074a16e261e1fb2baf59578a2ad0cd8ef6 (patch) | |
| tree | 84896b6e8bd1d22ac53eae795fb48a1c3f55ec5a /sound/soc | |
| parent | 3a839ce4f7e1446167cbb51189235e2f1b9a67a4 (diff) | |
| parent | de6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff) | |
Merge tag 'cleanup-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.
* tag 'cleanup-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: Include gpio-omap.h for board-h2 and board-h3
ARM: OMAP2+: Enable pinctrl dummy states
mfd: Fix compile for twl-core.c by removing cpu_is_omap usage
Diffstat (limited to 'sound/soc')
0 files changed, 0 insertions, 0 deletions