diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 46a9c585463a..d5ed7ff494a4 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.69 1996/05/01 03:26:58 bde Exp $
+#	$Id: GENERIC,v 1.70 1996/05/13 04:29:13 nate Exp $
 #
 
 machine		"i386"
@@ -66,7 +66,7 @@ controller	scbus0
 
 device		sd0
 
-device		od0
+device		od0	#See LINT for possible `od' options.
 
 device		st0
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7591761a3bc9..af2409f7eb28 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.263 1996/06/10 08:15:29 peter Exp $
+#	$Id: LINT,v 1.264 1996/06/14 09:42:52 asami Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -379,6 +379,24 @@ options		SCSIDEBUG
 #options	NO_SCSI_SENSE
 options		SCSI_REPORT_GEOMETRY
 
+# Options for the `od' optical disk driver:
+#
+# If drive returns sense key as 0x02 with vendor specific additional
+# sense code (ASC) and additional sense code qualifier (ASCQ), or
+# illegal ASC and ASCQ. This cause an error (NOT READY) and retrying.
+# To suppress this, use the following option.
+#
+options		OD_BOGUS_NOT_READY
+#
+# For an automatic spindown, try this.  Again, preferrably as an
+# option in your config file.
+# WARNING!  Use at your own risk.  Joerg's ancient SONY SMO drive
+# groks it fine, while Shunsuke's Fujitsu chokes on it and times
+# out.
+#
+options		OD_AUTO_TURNOFF
+
+
 
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 46a9c585463a..d5ed7ff494a4 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.69 1996/05/01 03:26:58 bde Exp $
+#	$Id: GENERIC,v 1.70 1996/05/13 04:29:13 nate Exp $
 #
 
 machine		"i386"
@@ -66,7 +66,7 @@ controller	scbus0
 
 device		sd0
 
-device		od0
+device		od0	#See LINT for possible `od' options.
 
 device		st0
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7591761a3bc9..af2409f7eb28 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.263 1996/06/10 08:15:29 peter Exp $
+#	$Id: LINT,v 1.264 1996/06/14 09:42:52 asami Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -379,6 +379,24 @@ options		SCSIDEBUG
 #options	NO_SCSI_SENSE
 options		SCSI_REPORT_GEOMETRY
 
+# Options for the `od' optical disk driver:
+#
+# If drive returns sense key as 0x02 with vendor specific additional
+# sense code (ASC) and additional sense code qualifier (ASCQ), or
+# illegal ASC and ASCQ. This cause an error (NOT READY) and retrying.
+# To suppress this, use the following option.
+#
+options		OD_BOGUS_NOT_READY
+#
+# For an automatic spindown, try this.  Again, preferrably as an
+# option in your config file.
+# WARNING!  Use at your own risk.  Joerg's ancient SONY SMO drive
+# groks it fine, while Shunsuke's Fujitsu chokes on it and times
+# out.
+#
+options		OD_AUTO_TURNOFF
+
+
 
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7591761a3bc9..af2409f7eb28 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.263 1996/06/10 08:15:29 peter Exp $
+#	$Id: LINT,v 1.264 1996/06/14 09:42:52 asami Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -379,6 +379,24 @@ options		SCSIDEBUG
 #options	NO_SCSI_SENSE
 options		SCSI_REPORT_GEOMETRY
 
+# Options for the `od' optical disk driver:
+#
+# If drive returns sense key as 0x02 with vendor specific additional
+# sense code (ASC) and additional sense code qualifier (ASCQ), or
+# illegal ASC and ASCQ. This cause an error (NOT READY) and retrying.
+# To suppress this, use the following option.
+#
+options		OD_BOGUS_NOT_READY
+#
+# For an automatic spindown, try this.  Again, preferrably as an
+# option in your config file.
+# WARNING!  Use at your own risk.  Joerg's ancient SONY SMO drive
+# groks it fine, while Shunsuke's Fujitsu chokes on it and times
+# out.
+#
+options		OD_AUTO_TURNOFF
+
+
 
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS