summaryrefslogtreecommitdiff
path: root/distrib/notes
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/notes')
-rw-r--r--distrib/notes/i386/hardware2
1 files changed, 2 insertions, 0 deletions
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 66b24f64778..5fa2fcb6b50 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -381,6 +381,8 @@ When all three extra devices are disabled and any changes made, the
'quit' command will exit the UKC. The kernel should then boot, and find
your Elite Ultra on device we1.
+<<<<<<< hardware
+=======
SPECIAL CARE FOR NEWER NOTEBOOK COMPUTERS AND PCMCIA
There is a problem on some newer notebooks with OpenBSD's autoconfiguration