diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:53:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:53:20 -0700 |
| commit | c3d1f1746b966907ba5ad2f75ddca24db8b21147 (patch) | |
| tree | 548a25e104d8bdb906030b8d3bf78fbfde0e5817 /arch/mips/configs/db1000_defconfig | |
| parent | 66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f (diff) | |
| parent | 0d365753d0b7c26043fdfa97790411606fb40112 (diff) | |
| download | kernel-mfld-blackbay-c3d1f1746b966907ba5ad2f75ddca24db8b21147.tar.gz kernel-mfld-blackbay-c3d1f1746b966907ba5ad2f75ddca24db8b21147.tar.bz2 kernel-mfld-blackbay-c3d1f1746b966907ba5ad2f75ddca24db8b21147.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
MIPS: PowerTV: Separate PowerTV USB support from non-USB code
MIPS: strip the un-needed sections of vmlinuz
MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS
MIPS: Clean up arch/mips/boot/compressed/decompress.c
MIPS: Clean up arch/mips/boot/compressed/ld.script
MIPS: Unify the suffix of compressed vmlinux.bin
MIPS: PowerTV: Add Gaia platform definitions.
MIPS: BCM47xx: Fix nvram_getenv return value.
MIPS: Octeon: Allow more than 3.75GB of memory with PCIe
MIPS: Clean up notify_die() usage.
MIPS: Remove unused task_struct.trap_no field.
Documentation: Mention that KProbes is supported on MIPS
SAMPLES: kprobe_example: Make it print something on MIPS.
MIPS: kprobe: Add support.
MIPS: Add instrunction format for BREAK and SYSCALL
MIPS: kprobes: Define regs_return_value()
MIPS: Ritually kill stupid printk.
MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.
MIPS: Octeon: Support 256 MSI on PCIe
MIPS: Decode core number for R2 CPUs.
...
Diffstat (limited to 'arch/mips/configs/db1000_defconfig')
| -rw-r--r-- | arch/mips/configs/db1000_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index f66d406aadc..3a9ec6ccd40 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig @@ -8,7 +8,7 @@ CONFIG_MIPS=y # # Machine selection # -CONFIG_MACH_ALCHEMY=y +CONFIG_MIPS_ALCHEMY=y # CONFIG_AR7 is not set # CONFIG_BCM47XX is not set # CONFIG_BCM63XX is not set @@ -64,7 +64,6 @@ CONFIG_MIPS_DB1000=y # CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_XXS1500 is not set CONFIG_SOC_AU1000=y -CONFIG_SOC_AU1X00=y CONFIG_LOONGSON_UART_BASE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set |