diff options
Diffstat (limited to 'arch/arm/mach-omap/am33xx_generic.c')
| -rw-r--r-- | arch/arm/mach-omap/am33xx_generic.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c index bfe5b3dc73..850fbceaec 100644 --- a/arch/arm/mach-omap/am33xx_generic.c +++ b/arch/arm/mach-omap/am33xx_generic.c @@ -21,13 +21,13 @@ #include <net.h> #include <restart.h> #include <asm/barebox-arm.h> -#include <mach/am33xx-silicon.h> -#include <mach/am33xx-clock.h> -#include <mach/emif4.h> -#include <mach/generic.h> -#include <mach/sys_info.h> -#include <mach/am33xx-generic.h> -#include <mach/gpmc.h> +#include <mach/omap/am33xx-silicon.h> +#include <mach/omap/am33xx-clock.h> +#include <mach/omap/emif4.h> +#include <mach/omap/generic.h> +#include <mach/omap/sys_info.h> +#include <mach/omap/am33xx-generic.h> +#include <mach/omap/gpmc.h> #include <reset_source.h> static void __noreturn am33xx_restart_soc(struct restart_handler *rst) @@ -153,8 +153,7 @@ static int am33xx_bootsource(void) default: src = BOOTSOURCE_UNKNOWN; } - bootsource_set(src); - bootsource_set_instance(instance); + bootsource_set_raw(src, instance); return 0; } @@ -420,7 +419,7 @@ void am33xx_select_rmii2_crs_dv(void) int am33xx_of_register_bootdevice(void) { - struct device_d *dev; + struct device *dev; switch (bootsource_get()) { case BOOTSOURCE_MMC: |