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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
pnx8550-jbs_defconfig
diff --git
a/arch/mips/configs/pnx8550-jbs_defconfig
b/arch/mips/configs/pnx8550-jbs_defconfig
index ac616c82d348c4bc4d3aa989a951e358ef7aee01..1cbf270c301ce416b8d84300db216980cb04e302 100644
(file)
--- a/
arch/mips/configs/pnx8550-jbs_defconfig
+++ b/
arch/mips/configs/pnx8550-jbs_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