diff options
| author | ian <ian@FreeBSD.org> | 2014-05-17 17:18:35 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-17 17:18:35 +0000 |
| commit | ee5c0f266a215d11845053dee100bb5ff4f274a2 (patch) | |
| tree | c80dd01b00a48b4600fc7509be5dd7e9320e5581 /sys/powerpc/conf | |
| parent | d7afc2b3b05345483cb35dd6d9103e6e355420bd (diff) | |
| download | FreeBSD-src-ee5c0f266a215d11845053dee100bb5ff4f274a2.zip FreeBSD-src-ee5c0f266a215d11845053dee100bb5ff4f274a2.tar.gz | |
MFC 261357, 261358, 261421:
Enable SCHED_ULE for ppc book-e.
Add driver for the ADT7460/ADT7467 fan controller found in
later PowerBooks and iBooks.
Diffstat (limited to 'sys/powerpc/conf')
| -rw-r--r-- | sys/powerpc/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/powerpc/conf/MPC85XX | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 492f1b3..ebd6963 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -126,6 +126,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 e222ddb..d296484 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 |
