diff options
| author | Daniel Hellstrom | 2011-05-23 23:04:46 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-06-02 23:32:37 +0200 |
| commit | cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd (patch) | |
| tree | efd967bcf69740b6960811871321658b5acb9db9 /arch/sparc/kernel/entry.S | |
| parent | Revert "mm: fail GFP_DMA allocations when ZONE_DMA is not configured" (diff) | |
| download | kernel-qcow2-linux-cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd.tar.gz kernel-qcow2-linux-cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd.tar.xz kernel-qcow2-linux-cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd.zip | |
sparc32: added CONFIG_PCIC_PCI Kconfig setting
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/entry.S')
| -rw-r--r-- | arch/sparc/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index 8341963f4c84..c4e616711348 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -1604,7 +1604,7 @@ restore_current: retl nop -#ifdef CONFIG_PCI +#ifdef CONFIG_PCIC_PCI #include <asm/pcic.h> .align 4 @@ -1650,7 +1650,7 @@ pcic_nmi_trap_patch: rd %psr, %l0 .word 0 -#endif /* CONFIG_PCI */ +#endif /* CONFIG_PCIC_PCI */ .globl flushw_all flushw_all: |