svn commit: r227982 - in head: . release/doc/en_US.ISO8859-1/hardware share/man/man4 sys/conf sys/dev/amd sys/modules sys/modules/amd

[Garrett Cooper]

On Fri, Nov 25, 2011 at 11:29 AM, Marius Strobl <marius at freebsd.org> wrote:
> Author: marius
> Date: Fri Nov 25 19:29:21 2011
> New Revision: 227982
> URL: http://svn.freebsd.org/changeset/base/227982
>
> Log:
>  Deorbit the broken amd(4) (see PR 124667), which was superseded by esp(4)
>  as of r227006.

    This commit broke tinderbox on i386/PAE and MIPS/OCTEON1. The
following change should unbreak things if the driver compiles
properly:
Thanks,
-Garrett

$ svn diff `ls sys/*/conf/* | grep -v BAYONETTA`
Index: sys/i386/conf/PAE
===================================================================
--- sys/i386/conf/PAE   (revision 227998)
+++ sys/i386/conf/PAE   (working copy)
@@ -24,7 +24,6 @@
 # than 4 gigabytes of memory.

 nodevice       ahb
-nodevice       amd
 nodevice       sym
 nodevice       trm

Index: sys/mips/conf/OCTEON1
===================================================================
--- sys/mips/conf/OCTEON1       (revision 227998)
+++ sys/mips/conf/OCTEON1       (working copy)
@@ -114,7 +114,7 @@
 device         ahd             # AHA39320/29320 and onboard AIC79xx devices
 options        AHD_REG_PRETTY_PRINT    # Print register bitfields in debug
                                # output.  Adds ~215k to driver.
-device         amd             # AMD 53C974 (Tekram DC-390(T))
+device         esp             # AMD Am53C974 (Tekram DC-390(T))
 device         hptiop          # Highpoint RocketRaid 3xxx series
 device         isp             # Qlogic family
 #device                ispfw           # Firmware for QLogic HBAs-
normally a module