Merge branch 'fb' into devel

[linux-2.6] / arch / frv / mb93090-mb00 / pci-frv.h

diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h
index 7481797ab38272047788eac912b894d18b3e3800..0c7bf39dc7298cb781c0b2b7ecf6c2a1be451b0c 100644 (file)
--- a/arch/frv/mb93090-mb00/pci-frv.h
+++ b/arch/frv/mb93090-mb00/pci-frv.h
@@ -17,8 +17,6 @@
 #define PCI_PROBE_BIOS         0x0001
 #define PCI_PROBE_CONF1                0x0002
 #define PCI_PROBE_CONF2                0x0004
-#define PCI_NO_SORT            0x0100
-#define PCI_BIOS_SORT          0x0200
 #define PCI_NO_CHECKS          0x0400
 #define PCI_ASSIGN_ROMS                0x1000
 #define PCI_BIOS_IRQ_SCAN      0x2000