diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
| commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
| tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-sa1100/generic.h | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index ec03f187c52b..b7a9a601c2d1 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h | |||
| @@ -13,8 +13,7 @@ extern void __init sa1100_init_gpio(void); | |||
| 13 | 13 | ||
| 14 | #define SET_BANK(__nr,__start,__size) \ | 14 | #define SET_BANK(__nr,__start,__size) \ |
| 15 | mi->bank[__nr].start = (__start), \ | 15 | mi->bank[__nr].start = (__start), \ |
| 16 | mi->bank[__nr].size = (__size), \ | 16 | mi->bank[__nr].size = (__size) |
| 17 | mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) | ||
| 18 | 17 | ||
| 19 | extern void (*sa1100fb_backlight_power)(int on); | 18 | extern void (*sa1100fb_backlight_power)(int on); |
| 20 | extern void (*sa1100fb_lcd_power)(int on); | 19 | extern void (*sa1100fb_lcd_power)(int on); |