Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/leds.h>
|
||||
#include <mach/board-ams-delta.h>
|
||||
#include <plat/board-ams-delta.h>
|
||||
|
||||
/*
|
||||
* Our context
|
||||
|
Reference in New Issue
Block a user