Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/acpi/acpi.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/acpi/acpi.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- src/sys/dev/acpi/acpi.c	2011/01/13 04:18:19	1.231
+++ src/sys/dev/acpi/acpi.c	2011/01/13 05:14:48	1.232
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.231 2011/01/13 04:18:19 jruoho Exp $	*/
+/*	$NetBSD: acpi.c,v 1.232 2011/01/13 05:14:48 jruoho Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.231 2011/01/13 04:18:19 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.232 2011/01/13 05:14:48 jruoho Exp $");
 
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
@@ -942,6 +942,14 @@ acpi_rescan_capabilities(device_t self)
 		}
 
 		/*
+		 * Scan docking stations.
+		 */
+		rv = AcpiGetHandle(ad->ad_handle, "_DCK", &tmp);
+
+		if (ACPI_SUCCESS(rv))
+			ad->ad_flags |= ACPI_DEVICE_DOCK;
+
+		/*
 		 * Scan devices that are ejectable.
 		 */
 		rv = AcpiGetHandle(ad->ad_handle, "_EJ0", &tmp);