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 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
ocelot_3_defconfig
diff --git
a/arch/mips/configs/ocelot_3_defconfig
b/arch/mips/configs/ocelot_3_defconfig
index ec5758f22676a98a6f9a11c85ac28eeee459e209..4d87da2b99fde8ee93cd2c14deff41256ce935bb 100644
(file)
--- a/
arch/mips/configs/ocelot_3_defconfig
+++ b/
arch/mips/configs/ocelot_3_defconfig
@@
-25,7
+25,6
@@
CONFIG_MIPS=y
# CONFIG_MIPS_COBALT is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MIPS_EV96100 is not set
# CONFIG_MIPS_IVR is not set
# CONFIG_MIPS_ITE8172 is not set
# CONFIG_MACH_JAZZ is not set