diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 12:01:22 -0400 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 12:01:22 -0400 |
| commit | 6a84872a3c3090993be108f02f91b4de062a7d32 (patch) | |
| tree | eb9029dda4b56efdc1488a8683c00c711075ca18 /arch/arm/mach-at91/at91sam9261_devices.c | |
| parent | d82b40133f2a7d50e491cecb64e4ea01dabd8672 (diff) | |
| parent | 138e8f1c4e99cd349e50fd8b18aebbd2716ceb87 (diff) | |
Merge branch 'at91-3.16-cleanup' into at91-3.16-dt3
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 80e35895d28f..43b21f456f6e 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include "board.h" | 30 | #include "board.h" |
| 31 | #include "generic.h" | 31 | #include "generic.h" |
| 32 | 32 | #include "gpio.h" | |
| 33 | 33 | ||
| 34 | /* -------------------------------------------------------------------- | 34 | /* -------------------------------------------------------------------- |
| 35 | * USB Host | 35 | * USB Host |