diff options
Diffstat (limited to 'arch/arm/boards/freescale-mx6-sabrelite/board.c')
| -rw-r--r-- | arch/arm/boards/freescale-mx6-sabrelite/board.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index f6eac4c0f3..fe47743540 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -8,27 +8,25 @@ #include <common.h> #include <init.h> #include <environment.h> -#include <mach/imx6-regs.h> +#include <mach/imx/imx6-regs.h> #include <gpio.h> -#include <mach/bbu.h> +#include <mach/imx/bbu.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> +#include <asm/mach-types.h> #include <of.h> -#include <partition.h> #include <deep-probe.h> #include <linux/phy.h> #include <asm/io.h> #include <asm/mmu.h> -#include <mach/generic.h> +#include <mach/imx/generic.h> #include <linux/sizes.h> #include <net.h> #include <linux/micrel_phy.h> -#include <mach/imx6.h> -#include <mach/devices-imx6.h> -#include <mach/iomux-mx6.h> +#include <mach/imx/imx6.h> +#include <mach/imx/iomux-mx6.h> #include <spi/spi.h> -#include <mach/spi.h> -#include <mach/usb.h> +#include <mach/imx/spi.h> +#include <mach/imx/usb.h> static iomux_v3_cfg_t sabrelite_enet_gpio_pads[] = { /* Ethernet */ @@ -125,7 +123,7 @@ static void sabrelite_ehci_init(void) gpio_set_value(IMX_GPIO_NR(7, 12), 1); } -static int sabrelite_probe(struct device_d *dev) +static int sabrelite_probe(struct device *dev) { int ret; @@ -160,7 +158,7 @@ static const struct of_device_id sabrelite_match[] = { { /* Sentinel */ }, }; -static struct driver_d sabrelite_driver = { +static struct driver sabrelite_driver = { .name = "physom-imx6", .probe = sabrelite_probe, .of_compatible = sabrelite_match, |