Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / cbus / retu.h

diff --git a/drivers/cbus/retu.h b/drivers/cbus/retu.h
index 49f23e664dcaa56c5034eb22741580096475ccf0..c9e044c1494543003227396a2d273e3f32c2266c 100644 (file)
--- a/drivers/cbus/retu.h
+++ b/drivers/cbus/retu.h
@@ -34,6 +34,7 @@
 #define RETU_REG_RTCHMAR       0x05    /* RTC hours and minutes alarm and time set register */
 #define RETU_REG_RTCCALR       0x06    /* RTC calibration register */
 #define RETU_REG_ADCR          0x08    /* ADC result */
+#define RETU_REG_ADCSCR                0x09    /* ADC sample ctrl */
 #define RETU_REG_CC1           0x0d    /* Common control register 1 */
 #define RETU_REG_CC2           0x0e    /* Common control register 2 */
 #define RETU_REG_CTRL_CLR      0x0f    /* Regulator clear register */