diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/mach-pxa/include/mach/pxa930.h | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/pxa930.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa930.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa930.h b/arch/arm/mach-pxa/include/mach/pxa930.h index d45f76a9b54d..190363b98d01 100644 --- a/arch/arm/mach-pxa/include/mach/pxa930.h +++ b/arch/arm/mach-pxa/include/mach/pxa930.h | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | #ifndef __MACH_PXA930_H | 1 | #ifndef __MACH_PXA930_H |
| 2 | #define __MACH_PXA930_H | 2 | #define __MACH_PXA930_H |
| 3 | 3 | ||
| 4 | #include <mach/hardware.h> | 4 | #include <mach/pxa3xx.h> |
| 5 | #include <mach/pxa3xx-regs.h> | ||
| 6 | #include <mach/mfp-pxa930.h> | 5 | #include <mach/mfp-pxa930.h> |
| 7 | 6 | ||
| 8 | #endif /* __MACH_PXA930_H */ | 7 | #endif /* __MACH_PXA930_H */ |