diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 5ebe21c88a..435535a917 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -8,14 +8,14 @@ #include <linux/sizes.h> #include <gpio.h> #include <asm/armlinux.h> -#include <mach/hardware.h> -#include <mach/board.h> -#include <mach/at91_pmc.h> -#include <mach/at91sam9260_matrix.h> -#include <mach/at91sam9_sdramc.h> -#include <mach/at91_rtt.h> -#include <mach/iomux.h> -#include <mach/cpu.h> +#include <mach/at91/hardware.h> +#include <mach/at91/board.h> +#include <mach/at91/at91_pmc.h> +#include <mach/at91/at91sam9260_matrix.h> +#include <mach/at91/at91sam9_sdramc.h> +#include <mach/at91/at91_rtt.h> +#include <mach/at91/iomux.h> +#include <mach/at91/cpu.h> #include <i2c/i2c-gpio.h> #include "generic.h" @@ -342,7 +342,7 @@ resource_size_t __init at91_configure_usart5(unsigned pins) /* Consider only one slot : slot 0 */ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) { - struct device_d *dev; + struct device *dev; if (!data) return; |