The patch titled
acpi: ix symbol conflict between acpiphp and dock
has been removed from the -mm tree. Its filename was
acpi-fix-symbol-conflict-between-acpiphp-and-dock.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: acpi: ix symbol conflict between acpiphp and dock
From: Prarit Bhargava <prarit@xxxxxxxxxx>
Fix bug which will cause acpiphp to not be able to load when dock.ko cannot
load.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/acpi/dock.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/acpi/dock.c~acpi-fix-symbol-conflict-between-acpiphp-and-dock drivers/acpi/dock.c
--- a/drivers/acpi/dock.c~acpi-fix-symbol-conflict-between-acpiphp-and-dock
+++ a/drivers/acpi/dock.c
@@ -444,6 +444,9 @@ static int dock_in_progress(struct dock_
*/
int register_dock_notifier(struct notifier_block *nb)
{
+ if (!dock_station)
+ return -ENODEV;
+
return atomic_notifier_chain_register(&dock_notifier_list, nb);
}
@@ -455,6 +458,9 @@ EXPORT_SYMBOL_GPL(register_dock_notifier
*/
void unregister_dock_notifier(struct notifier_block *nb)
{
+ if (!dock_station)
+ return;
+
atomic_notifier_chain_unregister(&dock_notifier_list, nb);
}
@@ -807,7 +813,7 @@ static int __init dock_init(void)
ACPI_UINT32_MAX, find_dock, &num, NULL);
if (!num)
- return -ENODEV;
+ printk(KERN_INFO "No dock devices found.\n");
return 0;
}
_
Patches currently in -mm which might be from prarit@xxxxxxxxxx are
git-acpi.patch
tty-signal-tty-locking.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
