Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / staging / sm750fb / ddk750_power.h

diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h
index 6e804d990cfff8ee41ffa23d4e148e2683a3f0ca..5963691f9a6880955bd0ad86a9fcbdb3231e280d 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_power.h
+++ b/drivers/staging/sm750fb/ddk750_power.h
@@ -9,13 +9,10 @@ typedef enum _DPMS_t {
 }
 DPMS_t;
 
-#define setDAC(off) \
-               {       \
-               POKE32(MISC_CTRL, FIELD_VALUE(PEEK32(MISC_CTRL), \
-                                                                       MISC_CTRL,      \
-                                                                       DAC_POWER,      \
-                                                                       off));  \
-               }
+#define setDAC(off) {                                                  \
+       POKE32(MISC_CTRL,                                               \
+              (PEEK32(MISC_CTRL) & ~MISC_CTRL_DAC_POWER_OFF) | (off)); \
+}
 
 void ddk750_setDPMS(DPMS_t);