diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-07-26 17:25:45 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-07-26 17:25:45 +0000 |
| commit | aa5a399b8c2ad3cd5bfa00e48573d4ed7fc2cc05 (patch) | |
| tree | a8b3ecbaddfdef4fcee89934d01950b80b23eac6 /sys/dev/acpi | |
| parent | 63ffefc6e49ef3805fa2358aad55722e0a093946 (diff) | |
remove merge error which was commited
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 4 |
1 files changed, 1 insertions, 3 deletions
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 */ |