projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[cascardo/linux.git]
/
arch
/
mips
/
configs
/
loongson3_defconfig
diff --git
a/arch/mips/configs/loongson3_defconfig
b/arch/mips/configs/loongson3_defconfig
index
ea1761f
..
4cb787f
100644
(file)
--- a/
arch/mips/configs/loongson3_defconfig
+++ b/
arch/mips/configs/loongson3_defconfig
@@
-1,6
+1,6
@@
CONFIG_MACH_LOONGSON=y
CONFIG_SWIOTLB=y
CONFIG_MACH_LOONGSON=y
CONFIG_SWIOTLB=y
-CONFIG_L
EMOTE_MACH3A
=y
+CONFIG_L
OONGSON_MACH3X
=y
CONFIG_CPU_LOONGSON3=y
CONFIG_64BIT=y
CONFIG_PAGE_SIZE_16KB=y
CONFIG_CPU_LOONGSON3=y
CONFIG_64BIT=y
CONFIG_PAGE_SIZE_16KB=y
@@
-120,7
+120,6
@@
CONFIG_BLK_DEV_CRYPTOLOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_RAID_ATTRS=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_RAID_ATTRS=m
-CONFIG_SCSI_TGT=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_CHR_DEV_SG=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_CHR_DEV_SG=y