diff options
author | Daniel Hellstrom <daniel@gaisler.com> | 2011-05-23 17:04:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-02 17:32:37 -0400 |
commit | cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd (patch) | |
tree | efd967bcf69740b6960811871321658b5acb9db9 /arch/sparc/kernel | |
parent | 1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c (diff) |
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')
-rw-r--r-- | arch/sparc/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/entry.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index 9cff2709a96d..59a2256aee38 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile | |||
@@ -73,7 +73,7 @@ obj-$(CONFIG_SPARC64_SMP) += cpumap.o | |||
73 | 73 | ||
74 | obj-y += dma.o | 74 | obj-y += dma.o |
75 | 75 | ||
76 | obj-$(CONFIG_SPARC32_PCI) += pcic.o | 76 | obj-$(CONFIG_PCIC_PCI) += pcic.o |
77 | 77 | ||
78 | obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o | 78 | obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o |
79 | obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o leon_smp.o | 79 | obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o leon_smp.o |
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: | |||
1604 | retl | 1604 | retl |
1605 | nop | 1605 | nop |
1606 | 1606 | ||
1607 | #ifdef CONFIG_PCI | 1607 | #ifdef CONFIG_PCIC_PCI |
1608 | #include <asm/pcic.h> | 1608 | #include <asm/pcic.h> |
1609 | 1609 | ||
1610 | .align 4 | 1610 | .align 4 |
@@ -1650,7 +1650,7 @@ pcic_nmi_trap_patch: | |||
1650 | rd %psr, %l0 | 1650 | rd %psr, %l0 |
1651 | .word 0 | 1651 | .word 0 |
1652 | 1652 | ||
1653 | #endif /* CONFIG_PCI */ | 1653 | #endif /* CONFIG_PCIC_PCI */ |
1654 | 1654 | ||
1655 | .globl flushw_all | 1655 | .globl flushw_all |
1656 | flushw_all: | 1656 | flushw_all: |