From f2093fb2e141ad1674b1a130a1ceb49ef0034078 Mon Sep 17 00:00:00 2001
From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Date: Fri, 24 Nov 2006 11:47:07 -0200
Subject: [PATCH] --- yaml --- r: 44959 b: refs/heads/master c:
 8d29726434697a5ed08d4e0dfba9399a098922f4 h: refs/heads/master i:   44957:
 d4256c70024ef2c4ae90388ee93f87d7e7a6db45   44955:
 760402776a09f8846ade30b6622378735e9c952f   44951:
 4d28cb872855d5b27ca06eec6314bec8ae522a1e   44943:
 80d6da0249641a45635458da5e47a21eb2f09ed9   44927:
 e1608316f09e5a42f322bf50eb4e0da2dd9a751a v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/acpi/ibm_acpi.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 86befd1d088d..eca4c49b7dd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dfd35cd214f7874c4917dfedff81f107d845c15
+refs/heads/master: 8d29726434697a5ed08d4e0dfba9399a098922f4
diff --git a/trunk/drivers/acpi/ibm_acpi.c b/trunk/drivers/acpi/ibm_acpi.c
index ce69f7592a22..b81a95d2067c 100644
--- a/trunk/drivers/acpi/ibm_acpi.c
+++ b/trunk/drivers/acpi/ibm_acpi.c
@@ -584,8 +584,7 @@ static int wan_status(void)
 {
 	int status;
 
-	if (!wan_supported ||
-	    !acpi_evalf(hkey_handle, &status, "GWAN", "d"))
+	if (!wan_supported || !acpi_evalf(hkey_handle, &status, "GWAN", "d"))
 		status = 0;
 
 	return status;
@@ -910,6 +909,7 @@ static int _sta(acpi_handle handle)
 
 	return status;
 }
+
 #ifdef CONFIG_ACPI_IBM_DOCK
 #define dock_docked() (_sta(dock_handle) & 1)
 
@@ -1386,12 +1386,12 @@ static int brightness_offset = 0x31;
 
 static int brightness_get(struct backlight_device *bd)
 {
-       u8 level;
-       if (!acpi_ec_read(brightness_offset, &level))
-               return -EIO;
+	u8 level;
+	if (!acpi_ec_read(brightness_offset, &level))
+		return -EIO;
 
-       level &= 0x7;
-       return level;
+	level &= 0x7;
+	return level;
 }
 
 static int brightness_read(char *p)
@@ -1993,10 +1993,10 @@ IBM_PARAM(volume);
 IBM_PARAM(fan);
 
 static struct backlight_properties ibm_backlight_data = {
-        .owner          = THIS_MODULE,
-        .get_brightness = brightness_get,
-        .update_status  = brightness_update_status,
-        .max_brightness = 7,
+	.owner = THIS_MODULE,
+	.get_brightness = brightness_get,
+	.update_status = brightness_update_status,
+	.max_brightness = 7,
 };
 
 static void acpi_ibm_exit(void)
@@ -2075,7 +2075,7 @@ static int __init acpi_ibm_init(void)
 
 	ibm_backlight_device = backlight_device_register("ibm", NULL,
 							 &ibm_backlight_data);
-        if (IS_ERR(ibm_backlight_device)) {
+	if (IS_ERR(ibm_backlight_device)) {
 		printk(IBM_ERR "Could not register ibm backlight device\n");
 		ibm_backlight_device = NULL;
 		acpi_ibm_exit();