From 4f308142849de30cfb7fb4e118c8a14f19c4514b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 7 Feb 2007 16:51:46 -0800
Subject: [PATCH] --- yaml --- r: 48663 b: refs/heads/master c:
 d94d3dff0d5da3bdfcbb424ba5c08534521fd690 h: refs/heads/master i:   48661:
 61e2d6c38e251f2efaada276e691c866393c031e   48659:
 97d0e14fe3dd2115730e53fe7aea5bc565e392bd   48655:
 823a8837b0ab39646b02771f27f66396865f9310 v: v3

---
 [refs]                            |  2 +-
 trunk/include/acpi/acpi_drivers.h | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4f6f6d32d39e..3bf3c29c3414 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a74388e21ef2adbba4450f7b3f05ffe88df630d5
+refs/heads/master: d94d3dff0d5da3bdfcbb424ba5c08534521fd690
diff --git a/trunk/include/acpi/acpi_drivers.h b/trunk/include/acpi/acpi_drivers.h
index 4dc8a5043ef0..3d7ebe0e4fc2 100644
--- a/trunk/include/acpi/acpi_drivers.h
+++ b/trunk/include/acpi/acpi_drivers.h
@@ -122,10 +122,24 @@ extern int register_hotplug_dock_device(acpi_handle handle,
 	acpi_notify_handler handler, void *context);
 extern void unregister_hotplug_dock_device(acpi_handle handle);
 #else
-#define is_dock_device(h)			(0)
-#define register_dock_notifier(nb) 		(-ENODEV)
-#define unregister_dock_notifier(nb)           	do { } while(0)
-#define register_hotplug_dock_device(h1, h2, c)	(-ENODEV)
-#define unregister_hotplug_dock_device(h)       do { } while(0)
+static inline int is_dock_device(acpi_handle handle)
+{
+	return 0;
+}
+static inline int register_dock_notifier(struct notifier_block *nb)
+{
+	return -ENODEV;
+}
+static inline void unregister_dock_notifier(struct notifier_block *nb)
+{
+}
+static inline int register_hotplug_dock_device(acpi_handle handle,
+				acpi_notify_handler handler, void *context)
+{
+	return -ENODEV;
+}
+static inline void unregister_hotplug_dock_device(acpi_handle handle)
+{
+}
 #endif
 #endif /*__ACPI_DRIVERS_H__*/