Skip to content

Commit bbe5a96

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Update defconfigs. sparc: Kill PROM console driver.
2 parents f205ce8 + 0a375d7 commit bbe5a96

File tree

12 files changed

+56
-680
lines changed

12 files changed

+56
-680
lines changed

‎Documentation/dontdiff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ piggy.gz
152152
piggyback
153153
pnmtologo
154154
ppc_defs.h*
155-
promcon_tbl.c
156155
pss_boot.h
157156
qconf
158157
raid6altivec*.c

‎arch/sparc/configs/sparc32_defconfig

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.31-rc1
4-
# Tue Aug 18 23:45:52 2009
3+
# Linux kernel version: 2.6.31
4+
# Wed Sep 16 00:03:43 2009
55
#
66
# CONFIG_64BIT is not set
77
CONFIG_SPARC=y
@@ -39,11 +39,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
3939
#
4040
# RCU Subsystem
4141
#
42-
CONFIG_CLASSIC_RCU=y
43-
# CONFIG_TREE_RCU is not set
44-
# CONFIG_PREEMPT_RCU is not set
42+
CONFIG_TREE_RCU=y
43+
# CONFIG_TREE_PREEMPT_RCU is not set
44+
# CONFIG_RCU_TRACE is not set
45+
CONFIG_RCU_FANOUT=32
46+
# CONFIG_RCU_FANOUT_EXACT is not set
4547
# CONFIG_TREE_RCU_TRACE is not set
46-
# CONFIG_PREEMPT_RCU_TRACE is not set
4748
# CONFIG_IKCONFIG is not set
4849
CONFIG_LOG_BUF_SHIFT=14
4950
CONFIG_GROUP_SCHED=y
@@ -87,10 +88,12 @@ CONFIG_TIMERFD=y
8788
CONFIG_EVENTFD=y
8889
CONFIG_SHMEM=y
8990
CONFIG_AIO=y
91+
CONFIG_HAVE_PERF_COUNTERS=y
9092

9193
#
9294
# Performance Counters
9395
#
96+
# CONFIG_PERF_COUNTERS is not set
9497
CONFIG_VM_EVENT_COUNTERS=y
9598
CONFIG_PCI_QUIRKS=y
9699
# CONFIG_STRIP_ASM_SYMS is not set
@@ -102,6 +105,8 @@ CONFIG_SLAB=y
102105
# CONFIG_MARKERS is not set
103106
CONFIG_HAVE_OPROFILE=y
104107
CONFIG_HAVE_ARCH_TRACEHOOK=y
108+
CONFIG_HAVE_DMA_ATTRS=y
109+
CONFIG_HAVE_DMA_API_DEBUG=y
105110

106111
#
107112
# GCOV-based kernel profiling
@@ -169,6 +174,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
169174
CONFIG_SUN_PM=y
170175
# CONFIG_SPARC_LED is not set
171176
CONFIG_SERIAL_CONSOLE=y
177+
# CONFIG_SPARC_LEON is not set
172178

173179
#
174180
# Bus options (PCI etc.)
@@ -259,6 +265,7 @@ CONFIG_IPV6_TUNNEL=m
259265
# CONFIG_NETFILTER is not set
260266
# CONFIG_IP_DCCP is not set
261267
# CONFIG_IP_SCTP is not set
268+
# CONFIG_RDS is not set
262269
# CONFIG_TIPC is not set
263270
# CONFIG_ATM is not set
264271
# CONFIG_BRIDGE is not set
@@ -288,14 +295,14 @@ CONFIG_NET_PKTGEN=m
288295
# CONFIG_AF_RXRPC is not set
289296
CONFIG_WIRELESS=y
290297
# CONFIG_CFG80211 is not set
298+
CONFIG_CFG80211_DEFAULT_PS_VALUE=0
291299
CONFIG_WIRELESS_OLD_REGULATORY=y
292300
# CONFIG_WIRELESS_EXT is not set
293301
# CONFIG_LIB80211 is not set
294302

295303
#
296304
# CFG80211 needs to be enabled for MAC80211
297305
#
298-
CONFIG_MAC80211_DEFAULT_PS_VALUE=0
299306
# CONFIG_WIMAX is not set
300307
# CONFIG_RFKILL is not set
301308
# CONFIG_NET_9P is not set
@@ -426,6 +433,7 @@ CONFIG_SCSI_QLOGICPTI=m
426433
# CONFIG_SCSI_NSP32 is not set
427434
# CONFIG_SCSI_DEBUG is not set
428435
CONFIG_SCSI_SUNESP=y
436+
# CONFIG_SCSI_PMCRAID is not set
429437
# CONFIG_SCSI_SRP is not set
430438
# CONFIG_SCSI_DH is not set
431439
# CONFIG_SCSI_OSD_INITIATOR is not set
@@ -524,12 +532,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
524532
# CONFIG_SFC is not set
525533
# CONFIG_BE2NET is not set
526534
# CONFIG_TR is not set
527-
528-
#
529-
# Wireless LAN
530-
#
531-
# CONFIG_WLAN_PRE80211 is not set
532-
# CONFIG_WLAN_80211 is not set
535+
# CONFIG_WLAN is not set
533536

534537
#
535538
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -569,18 +572,19 @@ CONFIG_INPUT_EVBUG=m
569572
#
570573
CONFIG_INPUT_KEYBOARD=y
571574
CONFIG_KEYBOARD_ATKBD=m
572-
CONFIG_KEYBOARD_SUNKBD=m
573575
# CONFIG_KEYBOARD_LKKBD is not set
574-
# CONFIG_KEYBOARD_XTKBD is not set
575576
# CONFIG_KEYBOARD_NEWTON is not set
576577
# CONFIG_KEYBOARD_STOWAWAY is not set
578+
CONFIG_KEYBOARD_SUNKBD=m
579+
# CONFIG_KEYBOARD_XTKBD is not set
577580
CONFIG_INPUT_MOUSE=y
578581
CONFIG_MOUSE_PS2=m
579582
CONFIG_MOUSE_PS2_ALPS=y
580583
CONFIG_MOUSE_PS2_LOGIPS2PP=y
581584
CONFIG_MOUSE_PS2_SYNAPTICS=y
582585
CONFIG_MOUSE_PS2_TRACKPOINT=y
583586
# CONFIG_MOUSE_PS2_ELANTECH is not set
587+
# CONFIG_MOUSE_PS2_SENTELIC is not set
584588
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
585589
CONFIG_MOUSE_SERIAL=m
586590
# CONFIG_MOUSE_APPLETOUCH is not set
@@ -708,12 +712,10 @@ CONFIG_SSB_POSSIBLE=y
708712
#
709713
# Console display driver support
710714
#
711-
# CONFIG_PROM_CONSOLE is not set
712715
CONFIG_DUMMY_CONSOLE=y
713716
# CONFIG_SOUND is not set
714717
CONFIG_HID_SUPPORT=y
715718
CONFIG_HID=y
716-
# CONFIG_HID_DEBUG is not set
717719
# CONFIG_HIDRAW is not set
718720
# CONFIG_HID_PID is not set
719721

@@ -814,6 +816,7 @@ CONFIG_FS_POSIX_ACL=y
814816
# CONFIG_GFS2_FS is not set
815817
# CONFIG_OCFS2_FS is not set
816818
# CONFIG_BTRFS_FS is not set
819+
# CONFIG_NILFS2_FS is not set
817820
CONFIG_FILE_LOCKING=y
818821
CONFIG_FSNOTIFY=y
819822
CONFIG_DNOTIFY=y
@@ -877,7 +880,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
877880
CONFIG_ROMFS_ON_BLOCK=y
878881
# CONFIG_SYSV_FS is not set
879882
# CONFIG_UFS_FS is not set
880-
# CONFIG_NILFS2_FS is not set
881883
CONFIG_NETWORK_FILESYSTEMS=y
882884
CONFIG_NFS_FS=y
883885
# CONFIG_NFS_V3 is not set
@@ -984,14 +986,17 @@ CONFIG_DEBUG_MEMORY_INIT=y
984986
# CONFIG_DEBUG_LIST is not set
985987
# CONFIG_DEBUG_SG is not set
986988
# CONFIG_DEBUG_NOTIFIERS is not set
989+
# CONFIG_DEBUG_CREDENTIALS is not set
987990
# CONFIG_BOOT_PRINTK_DELAY is not set
988991
# CONFIG_RCU_TORTURE_TEST is not set
989992
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
990993
# CONFIG_BACKTRACE_SELF_TEST is not set
991994
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
995+
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
992996
# CONFIG_FAULT_INJECTION is not set
993997
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
994998
# CONFIG_PAGE_POISONING is not set
999+
# CONFIG_DMA_API_DEBUG is not set
9951000
# CONFIG_SAMPLES is not set
9961001
CONFIG_HAVE_ARCH_KGDB=y
9971002
CONFIG_KGDB=y
@@ -1014,7 +1019,6 @@ CONFIG_CRYPTO=y
10141019
#
10151020
# Crypto core or helper
10161021
#
1017-
# CONFIG_CRYPTO_FIPS is not set
10181022
CONFIG_CRYPTO_ALGAPI=y
10191023
CONFIG_CRYPTO_ALGAPI2=y
10201024
CONFIG_CRYPTO_AEAD=y
@@ -1057,11 +1061,13 @@ CONFIG_CRYPTO_PCBC=m
10571061
#
10581062
CONFIG_CRYPTO_HMAC=y
10591063
# CONFIG_CRYPTO_XCBC is not set
1064+
# CONFIG_CRYPTO_VMAC is not set
10601065

10611066
#
10621067
# Digest
10631068
#
10641069
CONFIG_CRYPTO_CRC32C=m
1070+
# CONFIG_CRYPTO_GHASH is not set
10651071
CONFIG_CRYPTO_MD4=y
10661072
CONFIG_CRYPTO_MD5=y
10671073
CONFIG_CRYPTO_MICHAEL_MIC=m

0 commit comments

Comments
 (0)