diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 22:10:32 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:10:32 -0500 |
| commit | c0cd79d11412969b6b8fa1624cdc1277db82e2fe (patch) | |
| tree | 100ee9bb6f13fc0fb3d1887516712541a5fc0769 /drivers/acpi/ec.c | |
| parent | 81450b73dde07f473a4a7208b209b4c8b7251d90 (diff) | |
| parent | db2d4ccdc8f9f3433d3a8566404189f2e9295c23 (diff) | |
| download | op-kernel-dev-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.zip op-kernel-dev-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.tar.gz | |
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/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 8f5aaf7..ab68883 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -38,11 +38,10 @@ #include <acpi/actypes.h> #define _COMPONENT ACPI_EC_COMPONENT -ACPI_MODULE_NAME("acpi_ec") +ACPI_MODULE_NAME("ec"); #define ACPI_EC_COMPONENT 0x00100000 #define ACPI_EC_CLASS "embedded_controller" #define ACPI_EC_HID "PNP0C09" -#define ACPI_EC_DRIVER_NAME "ACPI Embedded Controller Driver" #define ACPI_EC_DEVICE_NAME "Embedded Controller" #define ACPI_EC_FILE_INFO "info" #undef PREFIX @@ -80,7 +79,7 @@ static int acpi_ec_stop(struct acpi_device *device, int type); static int acpi_ec_add(struct acpi_device *device); static struct acpi_driver acpi_ec_driver = { - .name = ACPI_EC_DRIVER_NAME, + .name = "ec", .class = ACPI_EC_CLASS, .ids = ACPI_EC_HID, .ops = { |
