diff options
author | ian <ian@FreeBSD.org> | 2015-02-13 15:27:46 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2015-02-13 15:27:46 +0000 |
commit | 2da29ea1769f4632eca0f7257bad77ae3a96989f (patch) | |
tree | 27f61227cecd9e45a86459c63764bb1867060c02 /sys/arm/conf/CNS11XXNAS | |
parent | f406596440fcef64f9c147bf6ab00c0b127a7aaa (diff) | |
download | FreeBSD-src-2da29ea1769f4632eca0f7257bad77ae3a96989f.zip FreeBSD-src-2da29ea1769f4632eca0f7257bad77ae3a96989f.tar.gz |
MFC r266647, r270912, r273089:
Reduce the diff between the PandaBoard and BeableBone kernel configs
Resync comments about scbus and pass for life after AHCI joined CAM.
Uncomment general options from the Pandaboard config. These are in other
configs and there is no reason for them not to be here.
Diffstat (limited to 'sys/arm/conf/CNS11XXNAS')
-rw-r--r-- | sys/arm/conf/CNS11XXNAS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS index a93adad..53640ff 100644 --- a/sys/arm/conf/CNS11XXNAS +++ b/sys/arm/conf/CNS11XXNAS @@ -111,7 +111,7 @@ device usb device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass device cfi |