Commit 3f6c148df42d98f0991baf4353497d380a30bc19

Authored by David S. Miller
1 parent 87e8b821ed

sparc64: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 16 additions and 12 deletions Side-by-side Diff

arch/sparc/configs/sparc64_defconfig
1 1 #
2 2 # Automatically generated make config: don't edit
3   -# Linux kernel version: 2.6.33
4   -# Wed Mar 3 02:54:29 2010
  3 +# Linux kernel version: 2.6.34-rc3
  4 +# Sat Apr 3 15:49:56 2010
5 5 #
6 6 CONFIG_64BIT=y
7 7 CONFIG_SPARC=y
... ... @@ -23,6 +23,7 @@
23 23 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
24 24 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
25 25 CONFIG_MMU=y
  26 +CONFIG_NEED_DMA_MAP_STATE=y
26 27 CONFIG_ARCH_NO_VIRT_TO_BUS=y
27 28 CONFIG_OF=y
28 29 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
... ... @@ -439,6 +440,7 @@
439 440 # CONFIG_ENCLOSURE_SERVICES is not set
440 441 # CONFIG_HP_ILO is not set
441 442 # CONFIG_ISL29003 is not set
  443 +# CONFIG_SENSORS_TSL2550 is not set
442 444 # CONFIG_DS1682 is not set
443 445 # CONFIG_C2PORT is not set
444 446  
... ... @@ -511,6 +513,7 @@
511 513 #
512 514 # SCSI device support
513 515 #
  516 +CONFIG_SCSI_MOD=y
514 517 CONFIG_RAID_ATTRS=m
515 518 CONFIG_SCSI=y
516 519 CONFIG_SCSI_DMA=y
... ... @@ -888,6 +891,7 @@
888 891 CONFIG_SERIAL_CORE=y
889 892 CONFIG_SERIAL_CORE_CONSOLE=y
890 893 # CONFIG_SERIAL_JSM is not set
  894 +# CONFIG_SERIAL_TIMBERDALE is not set
891 895 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
892 896 CONFIG_UNIX98_PTYS=y
893 897 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
... ... @@ -935,6 +939,7 @@
935 939 #
936 940 # CONFIG_I2C_OCORES is not set
937 941 # CONFIG_I2C_SIMTEC is not set
  942 +# CONFIG_I2C_XILINX is not set
938 943  
939 944 #
940 945 # External I2C/SMBus adapter drivers
941 946  
... ... @@ -948,15 +953,9 @@
948 953 #
949 954 # CONFIG_I2C_PCA_PLATFORM is not set
950 955 # CONFIG_I2C_STUB is not set
951   -
952   -#
953   -# Miscellaneous I2C Chip support
954   -#
955   -# CONFIG_SENSORS_TSL2550 is not set
956 956 # CONFIG_I2C_DEBUG_CORE is not set
957 957 # CONFIG_I2C_DEBUG_ALGO is not set
958 958 # CONFIG_I2C_DEBUG_BUS is not set
959   -# CONFIG_I2C_DEBUG_CHIP is not set
960 959 # CONFIG_SPI is not set
961 960  
962 961 #
963 962  
964 963  
... ... @@ -982,10 +981,11 @@
982 981 # CONFIG_SENSORS_ADM1029 is not set
983 982 # CONFIG_SENSORS_ADM1031 is not set
984 983 # CONFIG_SENSORS_ADM9240 is not set
  984 +# CONFIG_SENSORS_ADT7411 is not set
985 985 # CONFIG_SENSORS_ADT7462 is not set
986 986 # CONFIG_SENSORS_ADT7470 is not set
987   -# CONFIG_SENSORS_ADT7473 is not set
988 987 # CONFIG_SENSORS_ADT7475 is not set
  988 +# CONFIG_SENSORS_ASC7621 is not set
989 989 # CONFIG_SENSORS_ATXP1 is not set
990 990 # CONFIG_SENSORS_DS1621 is not set
991 991 # CONFIG_SENSORS_I5K_AMB is not set
992 992  
993 993  
994 994  
... ... @@ -1052,18 +1052,21 @@
1052 1052 # Multifunction device drivers
1053 1053 #
1054 1054 # CONFIG_MFD_CORE is not set
  1055 +# CONFIG_MFD_88PM860X is not set
1055 1056 # CONFIG_MFD_SM501 is not set
1056 1057 # CONFIG_HTC_PASIC3 is not set
1057 1058 # CONFIG_TWL4030_CORE is not set
1058 1059 # CONFIG_MFD_TMIO is not set
1059 1060 # CONFIG_PMIC_DA903X is not set
1060 1061 # CONFIG_PMIC_ADP5520 is not set
  1062 +# CONFIG_MFD_MAX8925 is not set
1061 1063 # CONFIG_MFD_WM8400 is not set
1062 1064 # CONFIG_MFD_WM831X is not set
1063 1065 # CONFIG_MFD_WM8350_I2C is not set
  1066 +# CONFIG_MFD_WM8994 is not set
1064 1067 # CONFIG_MFD_PCF50633 is not set
1065 1068 # CONFIG_AB3100_CORE is not set
1066   -# CONFIG_MFD_88PM8607 is not set
  1069 +# CONFIG_LPC_SCH is not set
1067 1070 # CONFIG_REGULATOR is not set
1068 1071 # CONFIG_MEDIA_SUPPORT is not set
1069 1072  
... ... @@ -1113,6 +1116,7 @@
1113 1116 # CONFIG_FB_LEO is not set
1114 1117 CONFIG_FB_XVR500=y
1115 1118 CONFIG_FB_XVR2500=y
  1119 +CONFIG_FB_XVR1000=y
1116 1120 # CONFIG_FB_S1D13XXX is not set
1117 1121 # CONFIG_FB_NVIDIA is not set
1118 1122 # CONFIG_FB_RIVA is not set
... ... @@ -1430,7 +1434,6 @@
1430 1434 # CONFIG_USB_RIO500 is not set
1431 1435 # CONFIG_USB_LEGOTOWER is not set
1432 1436 # CONFIG_USB_LCD is not set
1433   -# CONFIG_USB_BERRY_CHARGE is not set
1434 1437 # CONFIG_USB_LED is not set
1435 1438 # CONFIG_USB_CYPRESS_CY7C63 is not set
1436 1439 # CONFIG_USB_CYTHERM is not set
... ... @@ -1443,7 +1446,6 @@
1443 1446 # CONFIG_USB_IOWARRIOR is not set
1444 1447 # CONFIG_USB_TEST is not set
1445 1448 # CONFIG_USB_ISIGHTFW is not set
1446   -# CONFIG_USB_VST is not set
1447 1449 # CONFIG_USB_GADGET is not set
1448 1450  
1449 1451 #
... ... @@ -1610,6 +1612,7 @@
1610 1612 # CONFIG_BEFS_FS is not set
1611 1613 # CONFIG_BFS_FS is not set
1612 1614 # CONFIG_EFS_FS is not set
  1615 +# CONFIG_LOGFS is not set
1613 1616 # CONFIG_CRAMFS is not set
1614 1617 # CONFIG_SQUASHFS is not set
1615 1618 # CONFIG_VXFS_FS is not set
... ... @@ -1624,6 +1627,7 @@
1624 1627 # CONFIG_NFS_FS is not set
1625 1628 # CONFIG_NFSD is not set
1626 1629 # CONFIG_SMB_FS is not set
  1630 +# CONFIG_CEPH_FS is not set
1627 1631 # CONFIG_CIFS is not set
1628 1632 # CONFIG_NCP_FS is not set
1629 1633 # CONFIG_CODA_FS is not set