[PATCH] remove verify_area(): remove verify_area() from various uaccess.h headers

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

diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 0fb731a470dce94ccc1db343d2fa476dc41ca2fb..ad85e10001f461f81710bd33656a39ef086e44fd 100644 (file)
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -1025,7 +1025,7 @@ static int setup_notify(struct ibm_struct *ibm)
        return 0;
 }
 
-static int device_add(struct acpi_device *device)
+static int ibmacpi_device_add(struct acpi_device *device)
 {
        return 0;
 }
@@ -1043,7 +1043,7 @@ static int register_driver(struct ibm_struct *ibm)
        memset(ibm->driver, 0, sizeof(struct acpi_driver));
        sprintf(ibm->driver->name, "%s/%s", IBM_NAME, ibm->name);
        ibm->driver->ids = ibm->hid;
-       ibm->driver->ops.add = &device_add;
+       ibm->driver->ops.add = &ibmacpi_device_add;
 
        ret = acpi_bus_register_driver(ibm->driver);
        if (ret < 0) {
@@ -1185,6 +1185,10 @@ static int __init acpi_ibm_init(void)
        if (acpi_disabled)
                return -ENODEV;
 
+       if (!acpi_specific_hotkey_enabled){
+               printk(IBM_ERR "Using generic hotkey driver\n");
+               return -ENODEV; 
+       }
        /* these handles are required */
        if (IBM_HANDLE_INIT(ec,   1) < 0 ||
            IBM_HANDLE_INIT(hkey, 1) < 0 ||