git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
pb1200_defconfig
diff --git
a/arch/mips/configs/pb1200_defconfig
b/arch/mips/configs/pb1200_defconfig
index e9ad77320f168f5a7d4d11e246cda843a082ab99..0f908c6921114630aa9269d8e673bf1a61bfa76e 100644
(file)
--- a/
arch/mips/configs/pb1200_defconfig
+++ b/
arch/mips/configs/pb1200_defconfig
@@
-8,7
+8,7
@@
CONFIG_MIPS=y
#
# Machine selection
#
#
# Machine selection
#
-CONFIG_M
ACH
_ALCHEMY=y
+CONFIG_M
IPS
_ALCHEMY=y
# CONFIG_AR7 is not set
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
# CONFIG_AR7 is not set
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
@@
-64,7
+64,6
@@
CONFIG_MIPS_PB1200=y
# CONFIG_MIPS_PB1550 is not set
# CONFIG_MIPS_XXS1500 is not set
CONFIG_SOC_AU1200=y
# CONFIG_MIPS_PB1550 is not set
# CONFIG_MIPS_XXS1500 is not set
CONFIG_SOC_AU1200=y
-CONFIG_SOC_AU1X00=y
CONFIG_LOONGSON_UART_BASE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
CONFIG_LOONGSON_UART_BASE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set