Merge branch 'for-3.1' into for-3.2
This commit is contained in:
commit
b21a415d78
|
@ -13,6 +13,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/gpio.h>
|
||||
|
||||
#include <sound/soc.h>
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/gpio.h>
|
||||
|
||||
#include <sound/soc.h>
|
||||
|
|
Loading…
Reference in New Issue