From: deraadt <deraadt@openbsd.org>
Date: Mon, 26 Jul 2010 17:25:44 +0000 (+0000)
Subject: remove merge error which was commited
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=85b1a3ecd6b5a0b46ddda46feb3e748f722c45bc;p=openbsd

remove merge error which was commited
---

diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 4ba59f339a7..95bd0bf7586 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.188 2010/07/26 11:29:23 pirofti Exp $ */
+/* $OpenBSD: acpi.c,v 1.189 2010/07/26 17:25:44 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -2505,6 +2505,4 @@ acpikqfilter(dev_t dev, struct knote *kn)
 {
 	return (1);
 }
-
->>>>>>> 1.187
 #endif /* SMALL_KERNEL */