[2.6.25 patch] acpi_drivers.h: fix dock dummy functions

[Adrian Bunk]

Built-in code can't use functions in a modular ACPI dock driver.

This patch fixes the following build error reported by Thomas Meyer:

<--  snip  -->

...
 LD      .tmp_vmlinux1
drivers/built-in.o: In function `ata_acpi_associate':
(.text+0x7106a): undefined reference to `register_hotplug_dock_device'
drivers/built-in.o: In function `ata_acpi_associate':
(.text+0x710bd): undefined reference to `register_hotplug_dock_device'
make: *** [.tmp_vmlinux1] Fehler 1

<--  snip  -->

Signed-off-by: Adrian Bunk <adrian.bunk@xxxxxxxxx>

---
74baa78e04fe0f1aa04d3f09ab63a15da4d92fbd diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 9757a04..f70b246 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -113,7 +113,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
 /*--------------------------------------------------------------------------
                                   Dock Station
   -------------------------------------------------------------------------- */
-#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
+#if defined(CONFIG_ACPI_DOCK) || (defined(CONFIG_ACPI_DOCK_MODULE) && defined (MODULE))
 extern int is_dock_device(acpi_handle handle);
 extern int register_dock_notifier(struct notifier_block *nb);
 extern void unregister_dock_notifier(struct notifier_block *nb);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/