diff options
Diffstat (limited to 'arch/arm/mach-omap/omap4_generic.c')
| -rw-r--r-- | arch/arm/mach-omap/omap4_generic.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index 6d165b7f68..10190b152b 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -5,14 +5,14 @@ #include <init.h> #include <restart.h> #include <io.h> -#include <mach/omap4-clock.h> -#include <mach/omap4-silicon.h> -#include <mach/omap4-mux.h> -#include <mach/syslib.h> -#include <mach/generic.h> -#include <mach/gpmc.h> -#include <mach/omap4_rom_usb.h> -#include <mach/omap4-generic.h> +#include <mach/omap/omap4-clock.h> +#include <mach/omap/omap4-silicon.h> +#include <mach/omap/omap4-mux.h> +#include <mach/omap/syslib.h> +#include <mach/omap/generic.h> +#include <mach/omap/gpmc.h> +#include <mach/omap/omap4_rom_usb.h> +#include <mach/omap/omap4-generic.h> /* * The following several lines are taken from U-Boot to support @@ -498,8 +498,7 @@ static int omap4_bootsource(void) src = BOOTSOURCE_UNKNOWN; } - bootsource_set(src); - bootsource_set_instance(0); + bootsource_set_raw(src, 0); omap_vector_init(); |