diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 18:35:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 18:35:03 -0400 |
| commit | ad363e0916423b2e6cdfcdc30ae707ec709f0a65 (patch) | |
| tree | c47cc9062f7adc0ceb27f634b63b8548b733f01c /arch/arm/mach-ux500/include/mach/hardware.h | |
| parent | ed0795aa12129df9f3d2cc81ee579a9e54e12885 (diff) | |
| parent | 1032fbfd792f2b384ac16a63993b8fae5eea9083 (diff) | |
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
mach-ux500: voltage domain regulators for DB8500
cpufreq: make DB8500 cpufreq driver compile
cpufreq: update DB8500 cpufreq driver
mach-ux500: move CPUfreq driver to cpufreq subsystem
mfd: add DB5500 PRCMU driver
mfd: update DB8500 PRCMU driver
mach-ux500: move the DB8500 PRCMU driver to MFD
mach-ux500: make PRCMU base address dynamic
mach-ux500: rename PRCMU driver per SoC
mach-ux500: update ASIC version detection
mach-ux500: update SoC and board IRQ handling
mach-ux500: update the DB5500 register file
mach-ux500: update the DB8500 register file
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/hardware.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h index bf63f2631ba0..2c6f71049f2e 100644 --- a/arch/arm/mach-ux500/include/mach/hardware.h +++ b/arch/arm/mach-ux500/include/mach/hardware.h | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #ifndef __ASSEMBLY__ | 35 | #ifndef __ASSEMBLY__ |
| 36 | 36 | ||
| 37 | #include <mach/id.h> | 37 | #include <mach/id.h> |
| 38 | extern void __iomem *_PRCMU_BASE; | ||
| 38 | 39 | ||
| 39 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) | 40 | #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) |
| 40 | 41 | ||