diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:48:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:48:03 -0500 |
| commit | 21af0297c7e56024a5ccc4d8ad2a590f9ec371ba (patch) | |
| tree | 5d288c1877b1ae9fbe24aa7fabd79565e73d3d2f /arch/mips/configs/qemu_defconfig | |
| parent | 5ea293a9048d3a58cb0c840fa719d85ad14cba47 (diff) | |
| parent | a9d2517c7a5c8028fbc5296d3af3c75597d3d180 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (68 commits)
[MIPS] remove Documentation/mips/GT64120.README
[MIPS] Malta: remaining bits of the board support code cleanup
[MIPS] Malta: make the helper function static
[MIPS] Malta: fix braces at single statement blocks
[MIPS] Malta, Atlas: move an extern function declaration to the header file
[MIPS] Malta: Use C89 style for comments
[MIPS] Malta: else should follow close brace in malta_int.c
[MIPS] Malta: remove a superfluous comment
[MIPS] Malta: include <linux/cpu.h> instead of <asm/cpu.h>
[MIPS] Malta, Atlas, Sead: remove an extern from .c files
[MIPS] Malta: fix oversized lines in malta_int.c
[MIPS] Malta: remove a dead function declaration
[MIPS] Malta: use tabs not spaces
[MIPS] Malta: set up the screen info in a separate function
[MIPS] Malta: check the PCI clock frequency in a separate function
[MIPS] Malta: use the KERN_ facility level in printk()
[MIPS] Malta: use Linux kernel style for structure initialization
[MIPS]: constify function pointer tables
[MIPS] compat: handle argument endianess of sys32_(f)truncate64 with merge_64
[MIPS] Cobalt 64-bits kernels can be safely unmarked experimental
...
Diffstat (limited to 'arch/mips/configs/qemu_defconfig')
| -rw-r--r-- | arch/mips/configs/qemu_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index b3caf5125c1..72ca147f942 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig | |||
| @@ -37,7 +37,6 @@ CONFIG_ZONE_DMA=y | |||
| 37 | # CONFIG_PNX8550_STB810 is not set | 37 | # CONFIG_PNX8550_STB810 is not set |
| 38 | # CONFIG_MACH_VR41XX is not set | 38 | # CONFIG_MACH_VR41XX is not set |
| 39 | # CONFIG_PMC_YOSEMITE is not set | 39 | # CONFIG_PMC_YOSEMITE is not set |
| 40 | CONFIG_QEMU=y | ||
| 41 | # CONFIG_MARKEINS is not set | 40 | # CONFIG_MARKEINS is not set |
| 42 | # CONFIG_SGI_IP22 is not set | 41 | # CONFIG_SGI_IP22 is not set |
| 43 | # CONFIG_SGI_IP27 is not set | 42 | # CONFIG_SGI_IP27 is not set |
| @@ -47,7 +46,6 @@ CONFIG_QEMU=y | |||
| 47 | # CONFIG_SIBYTE_SENTOSA is not set | 46 | # CONFIG_SIBYTE_SENTOSA is not set |
| 48 | # CONFIG_SIBYTE_RHONE is not set | 47 | # CONFIG_SIBYTE_RHONE is not set |
| 49 | # CONFIG_SIBYTE_CARMEL is not set | 48 | # CONFIG_SIBYTE_CARMEL is not set |
| 50 | # CONFIG_SIBYTE_PTSWARM is not set | ||
| 51 | # CONFIG_SIBYTE_LITTLESUR is not set | 49 | # CONFIG_SIBYTE_LITTLESUR is not set |
| 52 | # CONFIG_SIBYTE_CRHINE is not set | 50 | # CONFIG_SIBYTE_CRHINE is not set |
| 53 | # CONFIG_SIBYTE_CRHONE is not set | 51 | # CONFIG_SIBYTE_CRHONE is not set |