diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /arch/mips/Makefile | |
| parent | a375b15164dd9264f724ad941825e52c90145151 (diff) | |
| parent | 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/mips/Makefile')
| -rw-r--r-- | arch/mips/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 53e3514ba10e..884819cd0607 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -191,6 +191,18 @@ endif | |||
| 191 | # | 191 | # |
| 192 | include $(srctree)/arch/mips/Kbuild.platforms | 192 | include $(srctree)/arch/mips/Kbuild.platforms |
| 193 | 193 | ||
| 194 | # | ||
| 195 | # NETLOGIC SOC Common (common) | ||
| 196 | # | ||
| 197 | cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic | ||
| 198 | cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic | ||
| 199 | |||
| 200 | # | ||
| 201 | # NETLOGIC XLR/XLS SoC, Simulator and boards | ||
| 202 | # | ||
| 203 | core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/ | ||
| 204 | load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff84000000 | ||
| 205 | |||
| 194 | cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic | 206 | cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic |
| 195 | drivers-$(CONFIG_PCI) += arch/mips/pci/ | 207 | drivers-$(CONFIG_PCI) += arch/mips/pci/ |
| 196 | 208 | ||