diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 12:33:44 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 12:33:44 -0500 |
| commit | 990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d (patch) | |
| tree | b0f6c896749f5beca20d74e72e4761aaa9e8ad2b /arch/arm/mach-omap2/common.h | |
| parent | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (diff) | |
| parent | 8a16a701ad787b6db2949766341c5ad1b551de9f (diff) | |
Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
* 'regulator' of git://github.com/hzhuang1/linux: (2 commits)
regulator: Remove bq24022 regulator driver
pxa: magician/hx4700: Convert to gpio-regulator from bq24022
(plus update to v3.3-rc6)
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index febffde2ff1..7e9338e8d68 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
| @@ -132,6 +132,7 @@ void omap3_map_io(void); | |||
| 132 | void am33xx_map_io(void); | 132 | void am33xx_map_io(void); |
| 133 | void omap4_map_io(void); | 133 | void omap4_map_io(void); |
| 134 | void ti81xx_map_io(void); | 134 | void ti81xx_map_io(void); |
| 135 | void omap_barriers_init(void); | ||
| 135 | 136 | ||
| 136 | /** | 137 | /** |
| 137 | * omap_test_timeout - busy-loop, testing a condition | 138 | * omap_test_timeout - busy-loop, testing a condition |