diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 17:52:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 17:52:21 -0400 |
| commit | d1447464789918db1e1a3d0aaf50d3d0f6487a4f (patch) | |
| tree | 490bd5c493cdba742dc90d3731962226838e5f33 /arch/mips/pmcs-msp71xx/Makefile | |
| parent | 833e68340d108d88f4cb79b7d7223f6859d362ca (diff) | |
| parent | 6ac5310e649df5fcd240d764503bf16a1317ea39 (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"MIPS updates:
- All the things that didn't make 3.10.
- Removes the Windriver PPMC platform. Nobody will miss it.
- Remove a workaround from kernel/irq/irqdomain.c which was there
exclusivly for MIPS. Patch by Grant Likely.
- More small improvments for the SEAD 3 platform
- Improvments on the BMIPS / SMP support for the BCM63xx series.
- Various cleanups of dead leftovers.
- Platform support for the Cavium Octeon-based EdgeRouter Lite.
Two large KVM patchsets didn't make it for this pull request because
their respective authors are vacationing"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits)
MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER
MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions
MIPS: SEAD3: Disable L2 cache on SEAD-3.
MIPS: BCM63xx: Enable second core SMP on BCM6328 if available
MIPS: BCM63xx: Add SMP support to prom.c
MIPS: define write{b,w,l,q}_relaxed
MIPS: Expose missing pci_io{map,unmap} declarations
MIPS: Malta: Update GCMP detection.
Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET"
MIPS: APSP: Remove <asm/kspd.h>
SSB: Kconfig: Amend SSB_EMBEDDED dependencies
MIPS: microMIPS: Fix improper definition of ISA exception bit.
MIPS: Don't try to decode microMIPS branch instructions where they cannot exist.
MIPS: Declare emulate_load_store_microMIPS as a static function.
MIPS: Fix typos and cleanup comment
MIPS: Cleanup indentation and whitespace
MIPS: BMIPS: support booting from physical CPU other than 0
MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS
MIPS: GIC: Fix gic_set_affinity infinite loop
MIPS: Don't save/restore OCTEON wide multiplier state on syscalls.
...
Diffstat (limited to 'arch/mips/pmcs-msp71xx/Makefile')
| -rw-r--r-- | arch/mips/pmcs-msp71xx/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/pmcs-msp71xx/Makefile b/arch/mips/pmcs-msp71xx/Makefile index cefba7733b73..9201c8b3858d 100644 --- a/arch/mips/pmcs-msp71xx/Makefile +++ b/arch/mips/pmcs-msp71xx/Makefile | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | # | 3 | # |
| 4 | obj-y += msp_prom.o msp_setup.o msp_irq.o \ | 4 | obj-y += msp_prom.o msp_setup.o msp_irq.o \ |
| 5 | msp_time.o msp_serial.o msp_elb.o | 5 | msp_time.o msp_serial.o msp_elb.o |
| 6 | obj-$(CONFIG_HAVE_GPIO_LIB) += gpio.o gpio_extended.o | ||
| 7 | obj-$(CONFIG_PMC_MSP7120_GW) += msp_hwbutton.o | 6 | obj-$(CONFIG_PMC_MSP7120_GW) += msp_hwbutton.o |
| 8 | obj-$(CONFIG_IRQ_MSP_SLP) += msp_irq_slp.o | 7 | obj-$(CONFIG_IRQ_MSP_SLP) += msp_irq_slp.o |
| 9 | obj-$(CONFIG_IRQ_MSP_CIC) += msp_irq_cic.o msp_irq_per.o | 8 | obj-$(CONFIG_IRQ_MSP_CIC) += msp_irq_cic.o msp_irq_per.o |