projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[powerpc.git]
/
arch
/
mips
/
configs
/
pb1550_defconfig
diff --git
a/arch/mips/configs/pb1550_defconfig
b/arch/mips/configs/pb1550_defconfig
index
e3bff46
..
df210dd
100644
(file)
--- a/
arch/mips/configs/pb1550_defconfig
+++ b/
arch/mips/configs/pb1550_defconfig
@@
-1,7
+1,7
@@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20
-#
Sun Feb 18 21:28:03
2007
+#
Tue Feb 20 21:47:37
2007
#
CONFIG_MIPS=y
#
CONFIG_MIPS=y
@@
-542,7
+542,6
@@
CONFIG_MTD_ALCHEMY=y
# NAND Flash Device Drivers
#
# CONFIG_MTD_NAND is not set
# NAND Flash Device Drivers
#
# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_CAFE is not set
#
# OneNAND Flash Device Drivers
#
# OneNAND Flash Device Drivers
@@
-557,6
+556,7
@@
CONFIG_MTD_ALCHEMY=y
#
# Plug and Play support
#
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
#
# Block devices
@@
-746,6
+746,7
@@
CONFIG_MIPS_AU1X00_ENET=y
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
CONFIG_QLA3XXX=m
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
CONFIG_QLA3XXX=m
+# CONFIG_ATL1 is not set
#
# Ethernet (10000 Mbit)
#
# Ethernet (10000 Mbit)
@@
-1206,6
+1207,7
@@
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_CROSSCOMPILE=y
CONFIG_CMDLINE=""
CONFIG_LOG_BUF_SHIFT=14
CONFIG_CROSSCOMPILE=y
CONFIG_CMDLINE=""
+CONFIG_SYS_SUPPORTS_KGDB=y
#
# Security options
#
# Security options