sys/bus/pci: Remove left over inclusion <sys/cdefs.h>.

diff --git a/sys/bus/pci/eisa_pci.c b/sys/bus/pci/eisa_pci.c
index c348e41..1e86e91 100644 (file)
--- a/sys/bus/pci/eisa_pci.c
+++ b/sys/bus/pci/eisa_pci.c
@@ -26,11 +26,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/eisa_pci.c,v 1.6.28.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/eisa_pci.c,v 1.6.28.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 /*
  * PCI:EISA bridge support
  */

diff --git a/sys/bus/pci/fixup_pci.c b/sys/bus/pci/fixup_pci.c
index ecade92..f0d082a 100644 (file)
--- a/sys/bus/pci/fixup_pci.c
+++ b/sys/bus/pci/fixup_pci.c
@@ -26,11 +26,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/fixup_pci.c,v 1.7.8.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/fixup_pci.c,v 1.7.8.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>

diff --git a/sys/bus/pci/hostb_pci.c b/sys/bus/pci/hostb_pci.c
index c960461..12ec83e 100644 (file)
--- a/sys/bus/pci/hostb_pci.c
+++ b/sys/bus/pci/hostb_pci.c
@@ -22,11 +22,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/hostb_pci.c,v 1.1.8.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/hostb_pci.c,v 1.1.8.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>

diff --git a/sys/bus/pci/i386/legacy.c b/sys/bus/pci/i386/legacy.c
index 1561c58..eba651c 100644 (file)
--- a/sys/bus/pci/i386/legacy.c
+++ b/sys/bus/pci/i386/legacy.c
@@ -25,11 +25,10 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/i386/i386/legacy.c,v 1.63.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/i386/i386/legacy.c,v 1.63.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 /*
  * This code implements a system driver for legacy systems that do not
  * support ACPI or when ACPI support is not present in the kernel.

diff --git a/sys/bus/pci/i386/pci_bus.c b/sys/bus/pci/i386/pci_bus.c
index 606e9a3..892fc01 100644 (file)
--- a/sys/bus/pci/i386/pci_bus.c
+++ b/sys/bus/pci/i386/pci_bus.c
@@ -22,11 +22,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.128.8.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.128.8.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include "opt_pci.h"
 
 #include <sys/param.h>

diff --git a/sys/bus/pci/i386/pci_cfgreg.c b/sys/bus/pci/i386/pci_cfgreg.c
index 1ac89af..4c2f1c4 100644 (file)
--- a/sys/bus/pci/i386/pci_cfgreg.c
+++ b/sys/bus/pci/i386/pci_cfgreg.c
@@ -25,17 +25,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.124.2.2.6.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.124.2.2.6.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#if defined(__DragonFly__)
-#define mtx_init(a, b, c, d) spin_init(a)
-#define mtx_lock_spin(a) spin_lock_wr(a)
-#define mtx_unlock_spin(a) spin_unlock_wr(a)
-#endif
-
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -60,6 +53,12 @@
 #include <vm/pmap.h>
 #include <machine/pmap.h>
 
+#if defined(__DragonFly__)
+#define mtx_init(a, b, c, d) spin_init(a)
+#define mtx_lock_spin(a) spin_lock_wr(a)
+#define mtx_unlock_spin(a) spin_unlock_wr(a)
+#endif
+
 #define PRVERB(a) do {                                                 \
        if (bootverbose)                                                \
                kprintf a ;                                             \

diff --git a/sys/bus/pci/i386/pci_pir.c b/sys/bus/pci/i386/pci_pir.c
index a5ae972..b4b1c22 100644 (file)
--- a/sys/bus/pci/i386/pci_pir.c
+++ b/sys/bus/pci/i386/pci_pir.c
@@ -25,11 +25,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/i386/pci/pci_pir.c,v 1.120.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/i386/pci/pci_pir.c,v 1.120.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

diff --git a/sys/bus/pci/ignore_pci.c b/sys/bus/pci/ignore_pci.c
index 237b463..3c15191 100644 (file)
--- a/sys/bus/pci/ignore_pci.c
+++ b/sys/bus/pci/ignore_pci.c
@@ -23,11 +23,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/ignore_pci.c,v 1.4.28.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/ignore_pci.c,v 1.4.28.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 /*
  * 'Ignore' driver - eats devices that show up errnoeously on PCI
  * but shouldn't ever be listed or handled by a driver.

diff --git a/sys/bus/pci/isa_pci.c b/sys/bus/pci/isa_pci.c
index 2818ab6..a0900ba 100644 (file)
--- a/sys/bus/pci/isa_pci.c
+++ b/sys/bus/pci/isa_pci.c
@@ -26,11 +26,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/isa_pci.c,v 1.13.8.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/isa_pci.c,v 1.13.8.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 /*
  * PCI:ISA bridge support
  */

diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c
index 1aa2cf5..79dc0a9 100644 (file)
--- a/sys/bus/pci/pci.c
+++ b/sys/bus/pci/pci.c
@@ -24,11 +24,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.355.2.9.2.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/pci.c,v 1.355.2.9.2.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include "opt_bus.h"
 #include "opt_compat_oldpci.h"
 

diff --git a/sys/bus/pci/pci_pci.c b/sys/bus/pci/pci_pci.c
index 75dcd1b..9c915dd 100644 (file)
--- a/sys/bus/pci/pci_pci.c
+++ b/sys/bus/pci/pci_pci.c
@@ -26,11 +26,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.50.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.50.2.2.4.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 /*
  * PCI:PCI bridge support.
  */

diff --git a/sys/bus/pci/pci_user.c b/sys/bus/pci/pci_user.c
index 9ed71ed..53c8aa3 100644 (file)
--- a/sys/bus/pci/pci_user.c
+++ b/sys/bus/pci/pci_user.c
@@ -22,11 +22,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.22.2.4.2.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/pci_user.c,v 1.22.2.4.2.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include "opt_bus.h"   /* XXX trim includes */
 #include "opt_compat.h"
 

diff --git a/sys/bus/pci/vga_pci.c b/sys/bus/pci/vga_pci.c
index 8d2444b..4125fc2 100644 (file)
--- a/sys/bus/pci/vga_pci.c
+++ b/sys/bus/pci/vga_pci.c
@@ -25,11 +25,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * __FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.5.8.1 2009/04/15 03:14:26 kensmith Exp $");
+ *
+ * $FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.5.8.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include <sys/cdefs.h>
-
 /*
  * Simple driver for PCI VGA display devices.  Drivers such as agp(4) and
  * drm(4) should attach as children of this device.