Merge branch 'sunxi/soc2' into next/soc
Adding one patch to fix build error. * sunxi/soc2: ARM: sunxi: add missing include for mdelay() Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
011d3090c8
@ -10,6 +10,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/of_address.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user