diff options
Diffstat (limited to 'arch/arm/boards/animeo_ip/init.c')
| -rw-r--r-- | arch/arm/boards/animeo_ip/init.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index ed0b9b7f87..452e005046 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -9,24 +9,23 @@ #include <init.h> #include <environment.h> #include <asm/armlinux.h> -#include <generated/mach-types.h> -#include <partition.h> +#include <asm/mach-types.h> #include <fs.h> #include <fcntl.h> #include <io.h> #include <envfs.h> -#include <mach/hardware.h> +#include <mach/at91/hardware.h> #include <nand.h> #include <linux/sizes.h> #include <linux/mtd/nand.h> #include <linux/mtd/rawnand.h> #include <linux/clk.h> -#include <mach/board.h> -#include <mach/at91sam9_smc.h> +#include <mach/at91/board.h> +#include <mach/at91/at91sam9_smc.h> #include <gpio.h> -#include <mach/iomux.h> -#include <mach/at91_pmc.h> -#include <mach/at91_rstc.h> +#include <mach/at91/iomux.h> +#include <mach/at91/at91_pmc.h> +#include <mach/at91/at91_rstc.h> #include <local_mac_address.h> static bool animeo_ip_is_buco; @@ -56,7 +55,7 @@ static int animeo_ip_get_pio_revision(int gpio, char *name) static void animeo_ip_detect_version(void) { - struct device_d *dev = NULL; + struct device *dev = NULL; char *model, *version; int val; @@ -312,7 +311,7 @@ static int animeo_ip_devices_init(void) device_initcall(animeo_ip_devices_init); -static struct device_d *usart0, *usart1; +static struct device *usart0, *usart1; static void animeo_ip_shutdown_uart(void __iomem *base) { |