From 2da29ea1769f4632eca0f7257bad77ae3a96989f Mon Sep 17 00:00:00 2001
From: ian <ian@FreeBSD.org>
Date: Fri, 13 Feb 2015 15:27:46 +0000
Subject: 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.
---
 sys/arm/conf/CNS11XXNAS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys/arm/conf/CNS11XXNAS')

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
-- 
cgit v1.1