From b52e62a664c640709fa499eb7ab3a89f0cb0eb43 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Oct 2008 13:39:55 +1100
Subject: [PATCH] --- yaml --- r: 117230 b: refs/heads/master c:
 1388cc964e680c1086ca0edae35be094cb29d51e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/pci.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c94e15ac848..1879b0f08ed8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61cfc7e442c52c14e632d9af0e70779cfa04249d
+refs/heads/master: 1388cc964e680c1086ca0edae35be094cb29d51e
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 955ab705c05e..752def8a2ef4 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -18,7 +18,6 @@
 #define LINUX_PCI_H
 
 #include <linux/pci_regs.h>	/* The pci register defines */
-#include <linux/io.h>
 
 /*
  * The PCI interface treats multi-function devices as independent
@@ -52,6 +51,7 @@
 #include <linux/kobject.h>
 #include <asm/atomic.h>
 #include <linux/device.h>
+#include <linux/io.h>
 
 /* Include the ID list */
 #include <linux/pci_ids.h>