Merge 7xx-iosplit-plat-merge with omap-fixes

Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
This commit is contained in:
Tony Lindgren 2009-11-22 10:08:43 -08:00
commit a76df42a67
272 changed files with 3839 additions and 1655 deletions

View file

@ -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