Deleted Added
full compact
25a26,27
> #include "opt_platform.h"
>
27c29
< __FBSDID("$FreeBSD: stable/10/sys/arm/at91/at91_rst.c 238369 2012-07-11 17:11:07Z imp $");
---
> __FBSDID("$FreeBSD: stable/10/sys/arm/at91/at91_rst.c 266196 2014-05-15 21:21:47Z ian $");
41a44,50
> #ifdef FDT
> #include <dev/fdt/fdt_common.h>
> #include <dev/ofw/ofw_bus.h>
> #include <dev/ofw/ofw_bus_subr.h>
> #define FDT_HACKS 1
> #endif
>
44a54
> #ifndef FDT
45a56
> #endif
95a107,110
> #ifdef FDT
> if (!ofw_bus_is_compatible(dev, "atmel,at91sam9260-rstc"))
> return (ENXIO);
> #endif
106c121
< int rid, err;
---
> int rid, err = 0;
120a136,137
>
> #ifndef FDT_HACKS
134a152
> #endif
163a182
> #ifndef FDT_HACKS
193a213
> #endif
208a229,232
> #ifdef FDT
> DRIVER_MODULE(at91_rst, simplebus, at91_rst_driver, at91_rst_devclass, NULL,
> NULL);
> #else
210a235
> #endif