summaryrefslogtreecommitdiff
path: root/distrib/notes
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2000-11-03 23:44:23 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2000-11-03 23:44:23 +0000
commitecdde282619b2d82c4029360db78c22b2fe2434c (patch)
treee90ab9460c1a133d5d6abe9eb3e04e5d1e672a8c /distrib/notes
parentafb2f959f7d8a0a0b21f8337275f8b4afd32e4be (diff)
byebye old doc about pcmcia and network cards; deraadt@ ok.
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