---

yaml
---
r: 32164
b: refs/heads/master
c: 84e74f6
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1959d21232931dfa686769a21161413f10d6652f
+refs/heads/master: 84e74f6b770efe7c9beb604118695aa311b969f5

trunk/drivers/acpi/Kconfig

@@ -133,13 +133,6 @@ config ACPI_FAN
 	  This driver adds support for ACPI fan devices, allowing user-mode 
 	  applications to perform basic fan control (on, off, status).
 
-config ACPI_DOCK
-	tristate "Dock"
-	depends on !ACPI_IBM_DOCK
-	default y
-	help
-	  This driver adds support for ACPI controlled docking stations
-
 config ACPI_PROCESSOR
 	tristate "Processor"
 	default y

trunk/drivers/acpi/Makefile

@@ -42,7 +42,6 @@ obj-$(CONFIG_ACPI_BATTERY)	+= battery.o
 obj-$(CONFIG_ACPI_BUTTON)	+= button.o
 obj-$(CONFIG_ACPI_EC)		+= ec.o
 obj-$(CONFIG_ACPI_FAN)		+= fan.o
-obj-$(CONFIG_ACPI_DOCK)		+= dock.o
 obj-$(CONFIG_ACPI_VIDEO)	+= video.o 
 obj-$(CONFIG_ACPI_HOTKEY)	+= hotkey.o
 obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o