diff options
author | Brian Gerst <bgerst@didntduck.org> | 2005-10-30 17:59:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:10 -0500 |
commit | 0d078f6f96809c95c69b99d6605a502b0ac63d3d (patch) | |
tree | 1b4691abab5f96f2aa8a5217a2701f181b41940d /drivers/pci/hotplug/pciehp_pci.c | |
parent | 4276d32260662d5401a15a0a46e506fb5c8ab563 (diff) |
[PATCH] CONFIG_IA32
Add CONFIG_X86_32 for i386. This allows selecting options that only apply
to 32-bit systems.
(X86 && !X86_64) becomes X86_32
(X86 || X86_64) becomes X86
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_pci.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index 33b539b34f7e..ff17d8e07e94 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c | |||
@@ -113,7 +113,7 @@ int pciehp_unconfigure_device(struct pci_func* func) | |||
113 | */ | 113 | */ |
114 | int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) | 114 | int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) |
115 | { | 115 | { |
116 | #if defined(CONFIG_X86) && !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64) | 116 | #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_IO_APIC) |
117 | int rc; | 117 | int rc; |
118 | u16 temp_word; | 118 | u16 temp_word; |
119 | struct pci_dev fakedev; | 119 | struct pci_dev fakedev; |