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/bay.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.gz linux-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.tar.bz2 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/bay.c')
| -rw-r--r-- | drivers/acpi/bay.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index 9c28081ba6a6..fb3f31b5e69f 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c @@ -32,11 +32,9 @@ #include <asm/uaccess.h> #include <linux/platform_device.h> -#define ACPI_BAY_DRIVER_NAME "ACPI Removable Drive Bay Driver" - -ACPI_MODULE_NAME("bay") +ACPI_MODULE_NAME("bay"); MODULE_AUTHOR("Kristen Carlson Accardi"); -MODULE_DESCRIPTION(ACPI_BAY_DRIVER_NAME); +MODULE_DESCRIPTION("ACPI Removable Drive Bay Driver"); MODULE_LICENSE("GPL"); #define ACPI_BAY_CLASS "bay" #define ACPI_BAY_COMPONENT 0x10000000 |