git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull sony into release branch
[pandora-kernel.git]
/
drivers
/
acpi
/
dock.c
diff --git
a/drivers/acpi/dock.c
b/drivers/acpi/dock.c
index
b3a04ff
..
54a697f
100644
(file)
--- a/
drivers/acpi/dock.c
+++ b/
drivers/acpi/dock.c
@@
-32,11
+32,11
@@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
-#define ACPI_DOCK_DRIVER_
NAME
"ACPI Dock Station Driver"
+#define ACPI_DOCK_DRIVER_
DESCRIPTION
"ACPI Dock Station Driver"
ACPI_MODULE_NAME("dock");
MODULE_AUTHOR("Kristen Carlson Accardi");
ACPI_MODULE_NAME("dock");
MODULE_AUTHOR("Kristen Carlson Accardi");
-MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_
NAME
);
+MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_
DESCRIPTION
);
MODULE_LICENSE("GPL");
static struct atomic_notifier_head dock_notifier_list;
MODULE_LICENSE("GPL");
static struct atomic_notifier_head dock_notifier_list;
@@
-741,7
+741,7
@@
static int dock_add(acpi_handle handle)
goto dock_add_err;
}
goto dock_add_err;
}
- printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_
NAME
);
+ printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_
DESCRIPTION
);
return 0;
return 0;