diff options
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 47247dc97c..708c946192 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -11,11 +11,11 @@ #include <restart.h> #include <linux/clk.h> -#include <mach/hardware.h> -#include <mach/cpu.h> -#include <mach/at91_dbgu.h> -#include <mach/at91_rstc.h> -#include <mach/board.h> +#include <mach/at91/hardware.h> +#include <mach/at91/cpu.h> +#include <mach/at91/at91_dbgu.h> +#include <mach/at91/at91_rstc.h> +#include <mach/at91/board.h> #include "generic.h" @@ -371,7 +371,7 @@ postcore_initcall(at91_detect); static int at91_soc_device(void) { - struct device_d *dev; + struct device *dev; dev = add_generic_device_res("soc", DEVICE_ID_SINGLE, NULL, 0, NULL); dev_add_param_fixed(dev, "name", (char*)at91_get_soc_type(&at91_soc_initdata)); @@ -403,6 +403,3 @@ void at91sam_phy_reset(void __iomem *rstc_base) /* Restore NRST value */ writel(AT91_RSTC_KEY | (rstc) | AT91_RSTC_URSTEN, rstc_base + AT91_RSTC_MR); } - -unsigned long at91_bootsource; -EXPORT_SYMBOL(at91_bootsource); |