From 17e04875ee0011decd16548eeb7141ffddaf7f61 Mon Sep 17 00:00:00 2001
From: Jiang Liu <jiang.liu@huawei.com>
Date: Mon, 14 Jan 2013 13:55:41 +0100
Subject: [PATCH] --- yaml --- r: 350842 b: refs/heads/master c:
 115c9ad854bd4c0f58ebcb967ec1b0a1c4e4b2d3 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/acpi/acpi_bus.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 48baf5c1e07c..908e0ed09b77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abe99210e0f624cea39f1dc375ba818b201c0d7f
+refs/heads/master: 115c9ad854bd4c0f58ebcb967ec1b0a1c4e4b2d3
diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h
index a9e1421cd007..c54ae562c4d4 100644
--- a/trunk/include/acpi/acpi_bus.h
+++ b/trunk/include/acpi/acpi_bus.h
@@ -91,8 +91,6 @@ struct acpi_device;
 typedef int (*acpi_op_add) (struct acpi_device * device);
 typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
 typedef int (*acpi_op_start) (struct acpi_device * device);
-typedef int (*acpi_op_bind) (struct acpi_device * device);
-typedef int (*acpi_op_unbind) (struct acpi_device * device);
 typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event);
 
 struct acpi_device_ops {