Merge branches 'devel-cleanup', 'devel-board', 'devel-early-init' and 'devel-ti816x' into omap-for-linus

This commit is contained in:
Tony Lindgren
2011-02-16 11:32:38 -08:00
90 mengubah file dengan 662 tambahan dan 383 penghapusan

Melihat File

@@ -31,7 +31,7 @@
*
*/
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
#include "omap2430.h"
#endif