Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / acpi / i2c_ec.c

diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c
index d2fde7ab3625e957f52ca154ae1485fbb7c65ee4..acab4a4818974df5487cdc27efcc3fad7d084308 100644 (file)
--- a/drivers/acpi/i2c_ec.c
+++ b/drivers/acpi/i2c_ec.c
@@ -14,7 +14,6 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
-#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
@@ -28,7 +27,6 @@
 #define ACPI_EC_HC_COMPONENT   0x00080000
 #define ACPI_EC_HC_CLASS       "ec_hc_smbus"
 #define ACPI_EC_HC_HID         "ACPI0001"
-#define ACPI_EC_HC_DRIVER_NAME "ACPI EC HC smbus driver"
 #define ACPI_EC_HC_DEVICE_NAME "EC HC smbus"
 
 #define _COMPONENT             ACPI_EC_HC_COMPONENT
@@ -340,6 +338,7 @@ static int acpi_ec_hc_add(struct acpi_device *device)
        smbus->adapter.owner = THIS_MODULE;
        smbus->adapter.algo = &acpi_ec_smbus_algorithm;
        smbus->adapter.algo_data = smbus;
+       smbus->adapter.dev.parent = &device->dev;
 
        if (i2c_add_adapter(&smbus->adapter)) {
                ACPI_DEBUG_PRINT((ACPI_DB_WARN,