diff --git a/include/cpu/generic/x86/arch/pci_ops.h b/include/cpu/generic/x86/arch/pci_ops.h
index 72f90aa2a9..9f195c6326 100644
--- a/include/cpu/generic/x86/arch/pci_ops.h
+++ b/include/cpu/generic/x86/arch/pci_ops.h
@@ -1,26 +1,25 @@
 /*
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-*/
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 #ifndef ARCH_I386_PCI_OPS_H
 #define ARCH_I386_PCI_OPS_H
 
 extern struct pci_bus_operations pci_cf8_conf1;
 extern struct pci_bus_operations pci_cf8_conf2;
 
-#if defined(CONFIG_MMCONF_SUPPORT) &&  (CONFIG_MMCONF_SUPPORT=='y')
+#if defined(CONFIG_MMCONF_SUPPORT) && (CONFIG_MMCONF_SUPPORT==1)
 extern struct pci_bus_operations pci_ops_mmconf;
 #endif
 
diff --git a/include/cpu/generic/x86/pci_ops.h b/include/cpu/generic/x86/pci_ops.h
deleted file mode 100644
index f23f2bca51..0000000000
--- a/include/cpu/generic/x86/pci_ops.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-*/
-#ifndef ARCH_I386_PCI_OPS_H
-#define ARCH_I386_PCI_OPS_H
-
-const struct pci_bus_operations pci_cf8_conf1;
-const struct pci_bus_operations pci_cf8_conf2;
-
-void pci_set_method(device_t dev);
-
-#endif /* ARCH_I386_PCI_OPS_H */
diff --git a/include/device/pci.h b/include/device/pci.h
index 18b67977a7..8ef0cf045a 100644
--- a/include/device/pci.h
+++ b/include/device/pci.h
@@ -48,17 +48,12 @@ struct pci_operations {
 
 /* Common pci bus operations */
 struct pci_bus_operations {
-	u8 (*read8)(struct bus *pbus, unsigned char bus, int devfn, int where);
-	u16 (*read16)(struct bus *pbus, unsigned char bus, int devfn,
-	              int where);
-	u32 (*read32)(struct bus *pbus, unsigned char bus, int devfn,
-	              int where);
-	void (*write8)(struct bus *pbus, unsigned char bus, int devfn,
-	               int where, u8 val);
-	void (*write16)(struct bus *pbus, unsigned char bus, int devfn,
-	                int where, u16 val);
-	void (*write32)(struct bus *pbus, unsigned char bus, int devfn,
-	                int where, u32 val);
+	u8 (*read8)(struct bus *pbus, int bus, int devfn, int where);
+	u16 (*read16)(struct bus *pbus, int bus, int devfn, int where);
+	u32 (*read32)(struct bus *pbus, int bus, int devfn, int where);
+	void (*write8)(struct bus *pbus, int bus, int devfn, int where, u8 val);
+	void (*write16)(struct bus *pbus, int bus, int devfn, int where, u16 val);
+	void (*write32)(struct bus *pbus, int bus, int devfn, int where, u32 val);
 };
 
 struct pci_driver {