diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-17 04:10:32 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-17 04:10:32 +0100 |
| commit | c0cd79d11412969b6b8fa1624cdc1277db82e2fe (patch) | |
| tree | 100ee9bb6f13fc0fb3d1887516712541a5fc0769 /drivers/acpi/i2c_ec.c | |
| parent | Pull misc-for-upstream into release branch (diff) | |
| parent | ACPI: IA64: react to acpi_table_parse() return value change (diff) | |
| download | linux-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.tar.xz linux-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.zip | |
Pull fluff into release branch
Conflicts:
arch/x86_64/pci/mmconfig.c
drivers/acpi/bay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/i2c_ec.c')
| -rw-r--r-- | drivers/acpi/i2c_ec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c index 76ec8b63e69f..acab4a481897 100644 --- a/drivers/acpi/i2c_ec.c +++ b/drivers/acpi/i2c_ec.c @@ -27,18 +27,17 @@ #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 -ACPI_MODULE_NAME("acpi_smbus") +ACPI_MODULE_NAME("i2c_ec"); static int acpi_ec_hc_add(struct acpi_device *device); static int acpi_ec_hc_remove(struct acpi_device *device, int type); static struct acpi_driver acpi_ec_hc_driver = { - .name = ACPI_EC_HC_DRIVER_NAME, + .name = "i2c_ec", .class = ACPI_EC_HC_CLASS, .ids = ACPI_EC_HC_HID, .ops = { |