Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index bbfb502add67..1997e12a1057 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -17,6 +17,7 @@
 #include <linux/spi/tdo24m.h>
 #include <linux/fb.h>
 #include <linux/lcd.h>
+#include <linux/slab.h>
 
 #define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
 
@@ -367,6 +368,7 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
 
         spi_message_init(m);
 
+        x->cs_change = 1;
         x->tx_buf = &lcd->buf[0];
         spi_message_add_tail(x, m);