Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / include / asm-i386 / ide.h

diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 4544401..e7817a3 100644 (file)
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -13,7 +13,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #ifndef MAX_HWIFS
 # ifdef CONFIG_BLK_DEV_IDEPCI
@@ -47,7 +46,7 @@ static __inline__ unsigned long ide_default_io_base(int index)
         *      defined compatibility mode ports for PCI. A user can 
         *      override this using ide= but we must default safe.
         */
-       if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
+       if (no_pci_devices()) {
                switch(index) {
                        case 2: return 0x1e8;
                        case 3: return 0x168;