diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2010-06-27 20:15:12 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2010-06-27 20:15:12 +0000 |
| commit | b4366208e481fe6c2f8c0b217ddd8af72921460f (patch) | |
| tree | 0a6ceb7890f0ca74d8193cb0d3b8e296396ac1a0 /sys | |
| parent | 97c473adbcea31108e6a401540b5fd9fa54bd1f4 (diff) | |
dont have duplicate xxx @ scsibus lines (even if commented).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/beagle/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/beagle/conf/RAMDISK | 20 |
2 files changed, 8 insertions, 21 deletions
diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC index 265b4cc75b7..4e93b751279 100644 --- a/sys/arch/beagle/conf/GENERIC +++ b/sys/arch/beagle/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.1 2010/06/01 03:12:28 drahn Exp $ +# $OpenBSD: GENERIC,v 1.2 2010/06/27 20:15:11 drahn Exp $ # # GENERIC machine description file # @@ -158,7 +158,6 @@ ch* at scsibus? ss* at scsibus? uk* at scsibus? - # onboard uarts com0 at ahb? addr 0x49020000 size 0x400 intr 74 # UART3 @@ -171,12 +170,6 @@ com0 at ahb? addr 0x49020000 size 0x400 intr 74 # UART3 sdmmc* at ommmc? # SD/MMC bus scsibus* at sdmmc? # SCSI emulation -sd* at scsibus? -st* at scsibus? -cd* at scsibus? -ch* at scsibus? -ss* at scsibus? -uk* at scsibus? # Bluetooth controllers #sbt* at sdmmc? # SDIO Bluetooth diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK index 12d202df921..aea1e2da333 100644 --- a/sys/arch/beagle/conf/RAMDISK +++ b/sys/arch/beagle/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.6 2010/04/26 20:51:51 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.7 2010/06/27 20:15:11 drahn Exp $ # # GENERIC machine description file # @@ -156,12 +156,12 @@ ommmc0 at ahb? addr 0x4809c000 intr 83 # # ukphy* at mii? # "unknown" PHYs # -# sd* at scsibus? -# st* at scsibus? -# cd* at scsibus? -# ch* at scsibus? -# ss* at scsibus? -# uk* at scsibus? +sd* at scsibus? +st* at scsibus? +cd* at scsibus? +ch* at scsibus? +ss* at scsibus? +uk* at scsibus? # onboard uarts @@ -176,12 +176,6 @@ com0 at ahb? addr 0x49020000 size 0x400 intr 74 # UART3 sdmmc* at ommmc? # SD/MMC bus scsibus* at sdmmc? # SCSI emulation -sd* at scsibus? -st* at scsibus? -cd* at scsibus? -ch* at scsibus? -ss* at scsibus? -uk* at scsibus? # Bluetooth controllers #sbt* at sdmmc? # SDIO Bluetooth |