summaryrefslogtreecommitdiff
path: root/drivers/acpi/bay.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-17 06:10:32 +0300
committerLen Brown <len.brown@intel.com>2007-02-17 06:10:32 +0300
commitc0cd79d11412969b6b8fa1624cdc1277db82e2fe (patch)
tree100ee9bb6f13fc0fb3d1887516712541a5fc0769 /drivers/acpi/bay.c
parent81450b73dde07f473a4a7208b209b4c8b7251d90 (diff)
parentdb2d4ccdc8f9f3433d3a8566404189f2e9295c23 (diff)
downloadlinux-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.tar.xz
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.c6
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