diff --git a/[refs] b/[refs]
index 6c4256ec8160..1d513526e194 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6680d2cab316a0c0e4cea0727e6d63426a77bb12
+refs/heads/master: 9ed62423033d167765a2c6385064acbeeadb2b14
diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
index eec10e78faba..cc121105e8c5 100644
--- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -63,8 +63,8 @@ struct dcon_priv {
 	u8 disp_mode;
 
 	/* Current output type; true == mono, false == color */
-	bool mono:1;
-	bool asleep:1;
+	bool mono;
+	bool asleep;
 };
 
 /* I2C structures */
@@ -516,7 +516,7 @@ static ssize_t dcon_sleep_show(struct device *dev,
 {
 
 	struct dcon_priv *dcon = dev_get_drvdata(dev);
-	return sprintf(buf, "%d\n", dcon->asleep ? 1 : 0);
+	return sprintf(buf, "%d\n", dcon->asleep);
 }
 
 static ssize_t dcon_freeze_show(struct device *dev,
@@ -529,7 +529,7 @@ static ssize_t dcon_mono_show(struct device *dev,
 	struct device_attribute *attr, char *buf)
 {
 	struct dcon_priv *dcon = dev_get_drvdata(dev);
-	return sprintf(buf, "%d\n", dcon->mono ? 1 : 0);
+	return sprintf(buf, "%d\n", dcon->mono);
 }
 
 static ssize_t dcon_resumeline_show(struct device *dev,
@@ -564,7 +564,7 @@ static ssize_t dcon_mono_store(struct device *dev,
 	if (_strtoul(buf, count, &enable_mono))
 		return -EINVAL;
 
-	dcon_set_mono_mode(dev_get_drvdata(dev), enable_mono ? 1 : 0);
+	dcon_set_mono_mode(dev_get_drvdata(dev), enable_mono ? true : false);
 	rc = count;
 
 	return rc;