summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap/omap3_generic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap/omap3_generic.c')
-rw-r--r--arch/arm/mach-omap/omap3_generic.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
index 69f2d51a62..8230b37619 100644
--- a/arch/arm/mach-omap/omap3_generic.c
+++ b/arch/arm/mach-omap/omap3_generic.c
@@ -32,17 +32,17 @@
#include <init.h>
#include <io.h>
#include <restart.h>
-#include <mach/omap3-silicon.h>
-#include <mach/gpmc.h>
-#include <mach/generic.h>
-#include <mach/sdrc.h>
-#include <mach/control.h>
-#include <mach/omap3-smx.h>
-#include <mach/clocks.h>
-#include <mach/omap3-clock.h>
-#include <mach/sys_info.h>
-#include <mach/syslib.h>
-#include <mach/omap3-generic.h>
+#include <mach/omap/omap3-silicon.h>
+#include <mach/omap/gpmc.h>
+#include <mach/omap/generic.h>
+#include <mach/omap/sdrc.h>
+#include <mach/omap/control.h>
+#include <mach/omap/omap3-smx.h>
+#include <mach/omap/clocks.h>
+#include <mach/omap/omap3-clock.h>
+#include <mach/omap/sys_info.h>
+#include <mach/omap/syslib.h>
+#include <mach/omap/omap3-generic.h>
#include <reset_source.h>
/**
@@ -475,8 +475,7 @@ static int omap3_bootsource(void)
src = BOOTSOURCE_UNKNOWN;
}
- bootsource_set(src);
- bootsource_set_instance(0);
+ bootsource_set_raw(src, 0);
return 0;
}