File tree Expand file tree Collapse file tree 5 files changed +10
-43
lines changed Expand file tree Collapse file tree 5 files changed +10
-43
lines changed Original file line number Diff line number Diff line change @@ -175,14 +175,6 @@ static void __init pcibios_assign_resources(void)
175
175
if (!r -> start && r -> end )
176
176
pci_assign_resource (dev , idx );
177
177
}
178
-
179
- if (pci_probe & PCI_ASSIGN_ROMS ) {
180
- r = & dev -> resource [PCI_ROM_RESOURCE ];
181
- r -> end -= r -> start ;
182
- r -> start = 0 ;
183
- if (r -> end )
184
- pci_assign_resource (dev , PCI_ROM_RESOURCE );
185
- }
186
178
}
187
179
}
188
180
Original file line number Diff line number Diff line change 14
14
#define DBG (x ...)
15
15
#endif
16
16
17
- #define PCI_PROBE_BIOS 0x0001
18
- #define PCI_PROBE_CONF1 0x0002
19
- #define PCI_PROBE_CONF2 0x0004
20
- #define PCI_NO_CHECKS 0x0400
21
- #define PCI_ASSIGN_ROMS 0x1000
22
- #define PCI_BIOS_IRQ_SCAN 0x2000
23
- #define PCI_ASSIGN_ALL_BUSSES 0x4000
24
-
25
17
extern unsigned int __nongpreldata pci_probe ;
26
18
27
19
/* pci-frv.c */
Original file line number Diff line number Diff line change @@ -183,18 +183,16 @@ static int __init pcibios_assign_resources(void)
183
183
struct pci_dev * dev = NULL ;
184
184
struct resource * r ;
185
185
186
- if (!(pci_probe & PCI_ASSIGN_ROMS )) {
187
- /* Try to use BIOS settings for ROMs, otherwise let
188
- pci_assign_unassigned_resources() allocate the new
189
- addresses. */
190
- for_each_pci_dev (dev ) {
191
- r = & dev -> resource [PCI_ROM_RESOURCE ];
192
- if (!r -> flags || !r -> start )
193
- continue ;
194
- if (pci_claim_resource (dev , PCI_ROM_RESOURCE ) < 0 ) {
195
- r -> end -= r -> start ;
196
- r -> start = 0 ;
197
- }
186
+ /* Try to use BIOS settings for ROMs, otherwise let
187
+ pci_assign_unassigned_resources() allocate the new
188
+ addresses. */
189
+ for_each_pci_dev (dev ) {
190
+ r = & dev -> resource [PCI_ROM_RESOURCE ];
191
+ if (!r -> flags || !r -> start )
192
+ continue ;
193
+ if (pci_claim_resource (dev , PCI_ROM_RESOURCE ) < 0 ) {
194
+ r -> end -= r -> start ;
195
+ r -> start = 0 ;
198
196
}
199
197
}
200
198
Original file line number Diff line number Diff line change 20
20
#define DBG (x ...)
21
21
#endif
22
22
23
- #define PCI_PROBE_BIOS 1
24
- #define PCI_PROBE_CONF1 2
25
- #define PCI_PROBE_CONF2 4
26
- #define PCI_NO_CHECKS 0x400
27
- #define PCI_ASSIGN_ROMS 0x1000
28
- #define PCI_BIOS_IRQ_SCAN 0x2000
29
-
30
23
extern unsigned int pci_probe ;
31
24
32
25
/* pci-asb2305.c */
Original file line number Diff line number Diff line change 11
11
12
12
#include <asm/io.h>
13
13
14
- /* startup values */
15
- #define PCI_PROBE_BIOS 1
16
- #define PCI_PROBE_CONF1 2
17
- #define PCI_PROBE_CONF2 4
18
- #define PCI_NO_CHECKS 0x400
19
- #define PCI_ASSIGN_ROMS 0x1000
20
- #define PCI_BIOS_IRQ_SCAN 0x2000
21
-
22
14
#define SH4_PCICR 0x100 /* PCI Control Register */
23
15
#define SH4_PCICR_PREFIX 0xA5000000 /* CR prefix for write */
24
16
#define SH4_PCICR_FTO 0x00000400 /* TRDY/IRDY Enable */
You can’t perform that action at this time.
0 commit comments