diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-05 11:10:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-05 11:10:54 -0800 |
| commit | c265c46bbb8c53db0bd084261ab2996c6d74aebf (patch) | |
| tree | 7eb8a877df7e2e89f6d907037becb55de740f21a /arch | |
| parent | 98bd0c07b60e029cf53eb76c027c27548dd66e9b (diff) | |
| parent | 7f7ff6bf0279ccb3d56f2b07c4cc88327c932a80 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/boot/.gitignore | 4 | ||||
| -rw-r--r-- | arch/sparc64/defconfig | 21 |
2 files changed, 17 insertions, 8 deletions
diff --git a/arch/sparc64/boot/.gitignore b/arch/sparc64/boot/.gitignore new file mode 100644 index 00000000000..36356f9d498 --- /dev/null +++ b/arch/sparc64/boot/.gitignore @@ -0,0 +1,4 @@ +image +tftpboot.img +vmlinux.aout +piggyback diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 9ceddad0fb4..bc56a7d8830 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc1 -# Wed Jan 18 13:41:02 2006 +# Linux kernel version: 2.6.16-rc2 +# Sat Feb 4 02:31:38 2006 # CONFIG_SPARC=y CONFIG_SPARC64=y @@ -23,7 +23,6 @@ CONFIG_HZ=250 # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -155,6 +154,7 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -224,6 +224,11 @@ CONFIG_IP_DCCP_TFRC_LIB=m # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set CONFIG_VLAN_8021Q=m @@ -233,11 +238,6 @@ CONFIG_VLAN_8021Q=m # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -657,6 +657,7 @@ CONFIG_SERIAL_SUNSU_CONSOLE=y CONFIG_SERIAL_SUNSAB=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -1118,6 +1119,10 @@ CONFIG_USB_HIDDEV=y # # +# EDAC - error detection and reporting (RAS) +# + +# # Misc Linux/SPARC drivers # CONFIG_SUN_OPENPROMIO=m |