Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

1 files changed, 15 insertions, 3 deletions

diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index b15b2b84a6f7..8e1731d3b228 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -27,14 +27,26 @@ static int fb_notifier_callback(struct notifier_block *self,
         struct fb_event *evdata = data;
 
         /* If we aren't interested in this event, skip it immediately ... */
-        if (event != FB_EVENT_BLANK)
+        switch (event) {
+        case FB_EVENT_BLANK:
+        case FB_EVENT_MODE_CHANGE:
+        case FB_EVENT_MODE_CHANGE_ALL:
+                break;
+        default:
                 return 0;
+        }
 
         ld = container_of(self, struct lcd_device, fb_notif);
+        if (!ld->ops)
+                return 0;
+
         mutex_lock(&ld->ops_lock);
-        if (ld->ops)
-                if (!ld->ops->check_fb || ld->ops->check_fb(ld, evdata->info))
+        if (!ld->ops->check_fb || ld->ops->check_fb(ld, evdata->info)) {
+                if (event == FB_EVENT_BLANK)
                         ld->ops->set_power(ld, *(int *)evdata->data);
+                else
+                        ld->ops->set_mode(ld, evdata->data);
+        }
         mutex_unlock(&ld->ops_lock);
         return 0;
 }