From 8279efe54e8195976d78790abe1551a5a26331b1 Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 1 Feb 2014 20:56:50 +0000
Subject: [PATCH] Switch default Book-E scheduler to ULE, which works now, and
 enable CAPABILITIES stuff required to make ssh work.

Hopefully, Book-E can eventually be added to GENERIC, which would avoid
this kind of issue with bitrot. That will require figuring out how to link
Book-E and AIM kernels at the same address, however...
---
 sys/powerpc/conf/GENERIC | 5 +++++
 sys/powerpc/conf/MPC85XX | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 318c6547c03e..61690fc56278 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -133,6 +133,11 @@ device		scc
 device		uart
 device		uart_z8530
 
+# FireWire support
+device		firewire	# FireWire bus code
+device		sbp		# SCSI over FireWire (Requires scbus and da)
+device		fwe		# Ethernet over FireWire (non-standard!)
+
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		miibus		# MII bus support
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index e222ddbc3b48..d29648457ad3 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -48,7 +48,9 @@ options 	NFSCL
 options 	NFSLOCKD
 options 	PROCFS
 options 	PSEUDOFS
-options 	SCHED_4BSD
+options 	SCHED_ULE
+options		CAPABILITIES
+options		CAPABILITY_MODE
 options		SMP
 options 	SYSVMSG
 options 	SYSVSEM
@@ -64,6 +66,7 @@ device		cryptodev
 device		da
 device		ds1553
 device		em
+device		alc
 device		ether
 device		fxp
 device		iic