diff options
| author | Will Schmidt <will_schmidt@vnet.ibm.com> | 2006-04-19 17:26:22 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-21 08:34:03 -0400 |
| commit | 5ad1bfeaf7a526ea5c5503c8a48e3a5a3efe18f7 (patch) | |
| tree | c65179a6846c450892ccbc5a44ecccb5549af587 | |
| parent | ea1e847cc202e805769c3c46ba5e5c53714068a1 (diff) | |
[PATCH] powerpc: update {g5,iseries,pseries}_defconfigs
Default choices for all.
Signed-off-by: Will Schmidt <willschm@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/configs/g5_defconfig | 58 | ||||
| -rw-r--r-- | arch/powerpc/configs/iseries_defconfig | 43 | ||||
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 54 |
3 files changed, 79 insertions, 76 deletions
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 2c3fd2007676..a45627547d03 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc2 | 3 | # Linux kernel version: 2.6.17-rc1 |
| 4 | # Fri Feb 10 17:33:08 2006 | 4 | # Wed Apr 19 13:24:37 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y | |||
| 9 | CONFIG_MMU=y | 9 | CONFIG_MMU=y |
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 12 | CONFIG_GENERIC_HWEIGHT=y | ||
| 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 13 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 13 | CONFIG_PPC=y | 14 | CONFIG_PPC=y |
| 14 | CONFIG_EARLY_PRINTK=y | 15 | CONFIG_EARLY_PRINTK=y |
| @@ -29,6 +30,7 @@ CONFIG_POWER4=y | |||
| 29 | CONFIG_PPC_FPU=y | 30 | CONFIG_PPC_FPU=y |
| 30 | CONFIG_ALTIVEC=y | 31 | CONFIG_ALTIVEC=y |
| 31 | CONFIG_PPC_STD_MMU=y | 32 | CONFIG_PPC_STD_MMU=y |
| 33 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 32 | CONFIG_SMP=y | 34 | CONFIG_SMP=y |
| 33 | CONFIG_NR_CPUS=4 | 35 | CONFIG_NR_CPUS=4 |
| 34 | 36 | ||
| @@ -53,6 +55,7 @@ CONFIG_SYSCTL=y | |||
| 53 | CONFIG_IKCONFIG=y | 55 | CONFIG_IKCONFIG=y |
| 54 | CONFIG_IKCONFIG_PROC=y | 56 | CONFIG_IKCONFIG_PROC=y |
| 55 | # CONFIG_CPUSETS is not set | 57 | # CONFIG_CPUSETS is not set |
| 58 | # CONFIG_RELAY is not set | ||
| 56 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 57 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 60 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 58 | # CONFIG_EMBEDDED is not set | 61 | # CONFIG_EMBEDDED is not set |
| @@ -67,10 +70,6 @@ CONFIG_BASE_FULL=y | |||
| 67 | CONFIG_FUTEX=y | 70 | CONFIG_FUTEX=y |
| 68 | CONFIG_EPOLL=y | 71 | CONFIG_EPOLL=y |
| 69 | CONFIG_SHMEM=y | 72 | CONFIG_SHMEM=y |
| 70 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 71 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 72 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 73 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 74 | CONFIG_SLAB=y | 73 | CONFIG_SLAB=y |
| 75 | # CONFIG_TINY_SHMEM is not set | 74 | # CONFIG_TINY_SHMEM is not set |
| 76 | CONFIG_BASE_SMALL=0 | 75 | CONFIG_BASE_SMALL=0 |
| @@ -82,7 +81,6 @@ CONFIG_BASE_SMALL=0 | |||
| 82 | CONFIG_MODULES=y | 81 | CONFIG_MODULES=y |
| 83 | CONFIG_MODULE_UNLOAD=y | 82 | CONFIG_MODULE_UNLOAD=y |
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 83 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | CONFIG_OBSOLETE_MODPARM=y | ||
| 86 | CONFIG_MODVERSIONS=y | 84 | CONFIG_MODVERSIONS=y |
| 87 | CONFIG_MODULE_SRCVERSION_ALL=y | 85 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 88 | CONFIG_KMOD=y | 86 | CONFIG_KMOD=y |
| @@ -91,6 +89,7 @@ CONFIG_STOP_MACHINE=y | |||
| 91 | # | 89 | # |
| 92 | # Block layer | 90 | # Block layer |
| 93 | # | 91 | # |
| 92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 94 | 93 | ||
| 95 | # | 94 | # |
| 96 | # IO Schedulers | 95 | # IO Schedulers |
| @@ -185,7 +184,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 185 | # CONFIG_PPC_INDIRECT_PCI is not set | 184 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 186 | CONFIG_PCI=y | 185 | CONFIG_PCI=y |
| 187 | CONFIG_PCI_DOMAINS=y | 186 | CONFIG_PCI_DOMAINS=y |
| 188 | CONFIG_PCI_LEGACY_PROC=y | ||
| 189 | # CONFIG_PCI_DEBUG is not set | 187 | # CONFIG_PCI_DEBUG is not set |
| 190 | 188 | ||
| 191 | # | 189 | # |
| @@ -227,6 +225,7 @@ CONFIG_SYN_COOKIES=y | |||
| 227 | CONFIG_INET_AH=m | 225 | CONFIG_INET_AH=m |
| 228 | CONFIG_INET_ESP=m | 226 | CONFIG_INET_ESP=m |
| 229 | CONFIG_INET_IPCOMP=m | 227 | CONFIG_INET_IPCOMP=m |
| 228 | CONFIG_INET_XFRM_TUNNEL=m | ||
| 230 | CONFIG_INET_TUNNEL=y | 229 | CONFIG_INET_TUNNEL=y |
| 231 | CONFIG_INET_DIAG=y | 230 | CONFIG_INET_DIAG=y |
| 232 | CONFIG_INET_TCP_DIAG=y | 231 | CONFIG_INET_TCP_DIAG=y |
| @@ -238,6 +237,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 238 | # | 237 | # |
| 239 | # CONFIG_IP_VS is not set | 238 | # CONFIG_IP_VS is not set |
| 240 | # CONFIG_IPV6 is not set | 239 | # CONFIG_IPV6 is not set |
| 240 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 241 | # CONFIG_INET6_TUNNEL is not set | ||
| 241 | CONFIG_NETFILTER=y | 242 | CONFIG_NETFILTER=y |
| 242 | # CONFIG_NETFILTER_DEBUG is not set | 243 | # CONFIG_NETFILTER_DEBUG is not set |
| 243 | 244 | ||
| @@ -261,6 +262,7 @@ CONFIG_IP_NF_IRC=m | |||
| 261 | CONFIG_IP_NF_TFTP=m | 262 | CONFIG_IP_NF_TFTP=m |
| 262 | CONFIG_IP_NF_AMANDA=m | 263 | CONFIG_IP_NF_AMANDA=m |
| 263 | # CONFIG_IP_NF_PPTP is not set | 264 | # CONFIG_IP_NF_PPTP is not set |
| 265 | # CONFIG_IP_NF_H323 is not set | ||
| 264 | CONFIG_IP_NF_QUEUE=m | 266 | CONFIG_IP_NF_QUEUE=m |
| 265 | 267 | ||
| 266 | # | 268 | # |
| @@ -513,6 +515,7 @@ CONFIG_MD_RAID0=y | |||
| 513 | CONFIG_MD_RAID1=y | 515 | CONFIG_MD_RAID1=y |
| 514 | CONFIG_MD_RAID10=m | 516 | CONFIG_MD_RAID10=m |
| 515 | CONFIG_MD_RAID5=y | 517 | CONFIG_MD_RAID5=y |
| 518 | # CONFIG_MD_RAID5_RESHAPE is not set | ||
| 516 | CONFIG_MD_RAID6=m | 519 | CONFIG_MD_RAID6=m |
| 517 | CONFIG_MD_MULTIPATH=m | 520 | CONFIG_MD_MULTIPATH=m |
| 518 | CONFIG_MD_FAULTY=m | 521 | CONFIG_MD_FAULTY=m |
| @@ -761,7 +764,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 761 | # Watchdog Cards | 764 | # Watchdog Cards |
| 762 | # | 765 | # |
| 763 | # CONFIG_WATCHDOG is not set | 766 | # CONFIG_WATCHDOG is not set |
| 764 | # CONFIG_RTC is not set | ||
| 765 | CONFIG_GEN_RTC=y | 767 | CONFIG_GEN_RTC=y |
| 766 | # CONFIG_GEN_RTC_X is not set | 768 | # CONFIG_GEN_RTC_X is not set |
| 767 | # CONFIG_DTLK is not set | 769 | # CONFIG_DTLK is not set |
| @@ -772,6 +774,7 @@ CONFIG_GEN_RTC=y | |||
| 772 | # Ftape, the floppy tape device driver | 774 | # Ftape, the floppy tape device driver |
| 773 | # | 775 | # |
| 774 | CONFIG_AGP=m | 776 | CONFIG_AGP=m |
| 777 | # CONFIG_AGP_VIA is not set | ||
| 775 | CONFIG_AGP_UNINORTH=m | 778 | CONFIG_AGP_UNINORTH=m |
| 776 | # CONFIG_DRM is not set | 779 | # CONFIG_DRM is not set |
| 777 | CONFIG_RAW_DRIVER=y | 780 | CONFIG_RAW_DRIVER=y |
| @@ -813,7 +816,6 @@ CONFIG_I2C_POWERMAC=y | |||
| 813 | # CONFIG_I2C_PARPORT_LIGHT is not set | 816 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 814 | # CONFIG_I2C_PROSAVAGE is not set | 817 | # CONFIG_I2C_PROSAVAGE is not set |
| 815 | # CONFIG_I2C_SAVAGE4 is not set | 818 | # CONFIG_I2C_SAVAGE4 is not set |
| 816 | # CONFIG_SCx200_ACB is not set | ||
| 817 | # CONFIG_I2C_SIS5595 is not set | 819 | # CONFIG_I2C_SIS5595 is not set |
| 818 | # CONFIG_I2C_SIS630 is not set | 820 | # CONFIG_I2C_SIS630 is not set |
| 819 | # CONFIG_I2C_SIS96X is not set | 821 | # CONFIG_I2C_SIS96X is not set |
| @@ -832,9 +834,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 832 | # CONFIG_SENSORS_PCF8574 is not set | 834 | # CONFIG_SENSORS_PCF8574 is not set |
| 833 | # CONFIG_SENSORS_PCA9539 is not set | 835 | # CONFIG_SENSORS_PCA9539 is not set |
| 834 | # CONFIG_SENSORS_PCF8591 is not set | 836 | # CONFIG_SENSORS_PCF8591 is not set |
| 835 | # CONFIG_SENSORS_RTC8564 is not set | ||
| 836 | # CONFIG_SENSORS_MAX6875 is not set | 837 | # CONFIG_SENSORS_MAX6875 is not set |
| 837 | # CONFIG_RTC_X1205_I2C is not set | ||
| 838 | # CONFIG_I2C_DEBUG_CORE is not set | 838 | # CONFIG_I2C_DEBUG_CORE is not set |
| 839 | # CONFIG_I2C_DEBUG_ALGO is not set | 839 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 840 | # CONFIG_I2C_DEBUG_BUS is not set | 840 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -862,10 +862,6 @@ CONFIG_I2C_POWERMAC=y | |||
| 862 | # | 862 | # |
| 863 | 863 | ||
| 864 | # | 864 | # |
| 865 | # Multimedia Capabilities Port drivers | ||
| 866 | # | ||
| 867 | |||
| 868 | # | ||
| 869 | # Multimedia devices | 865 | # Multimedia devices |
| 870 | # | 866 | # |
| 871 | # CONFIG_VIDEO_DEV is not set | 867 | # CONFIG_VIDEO_DEV is not set |
| @@ -874,6 +870,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 874 | # Digital Video Broadcasting Devices | 870 | # Digital Video Broadcasting Devices |
| 875 | # | 871 | # |
| 876 | # CONFIG_DVB is not set | 872 | # CONFIG_DVB is not set |
| 873 | # CONFIG_USB_DABUSB is not set | ||
| 877 | 874 | ||
| 878 | # | 875 | # |
| 879 | # Graphics support | 876 | # Graphics support |
| @@ -883,6 +880,7 @@ CONFIG_FB_CFB_FILLRECT=y | |||
| 883 | CONFIG_FB_CFB_COPYAREA=y | 880 | CONFIG_FB_CFB_COPYAREA=y |
| 884 | CONFIG_FB_CFB_IMAGEBLIT=y | 881 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 885 | CONFIG_FB_MACMODES=y | 882 | CONFIG_FB_MACMODES=y |
| 883 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 886 | CONFIG_FB_MODE_HELPERS=y | 884 | CONFIG_FB_MODE_HELPERS=y |
| 887 | CONFIG_FB_TILEBLITTING=y | 885 | CONFIG_FB_TILEBLITTING=y |
| 888 | # CONFIG_FB_CIRRUS is not set | 886 | # CONFIG_FB_CIRRUS is not set |
| @@ -901,7 +899,6 @@ CONFIG_FB_NVIDIA=y | |||
| 901 | CONFIG_FB_NVIDIA_I2C=y | 899 | CONFIG_FB_NVIDIA_I2C=y |
| 902 | # CONFIG_FB_RIVA is not set | 900 | # CONFIG_FB_RIVA is not set |
| 903 | # CONFIG_FB_MATROX is not set | 901 | # CONFIG_FB_MATROX is not set |
| 904 | # CONFIG_FB_RADEON_OLD is not set | ||
| 905 | CONFIG_FB_RADEON=y | 902 | CONFIG_FB_RADEON=y |
| 906 | CONFIG_FB_RADEON_I2C=y | 903 | CONFIG_FB_RADEON_I2C=y |
| 907 | # CONFIG_FB_RADEON_DEBUG is not set | 904 | # CONFIG_FB_RADEON_DEBUG is not set |
| @@ -958,9 +955,11 @@ CONFIG_SND_SEQUENCER=m | |||
| 958 | CONFIG_SND_OSSEMUL=y | 955 | CONFIG_SND_OSSEMUL=y |
| 959 | CONFIG_SND_MIXER_OSS=m | 956 | CONFIG_SND_MIXER_OSS=m |
| 960 | CONFIG_SND_PCM_OSS=m | 957 | CONFIG_SND_PCM_OSS=m |
| 958 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 961 | CONFIG_SND_SEQUENCER_OSS=y | 959 | CONFIG_SND_SEQUENCER_OSS=y |
| 962 | # CONFIG_SND_DYNAMIC_MINORS is not set | 960 | # CONFIG_SND_DYNAMIC_MINORS is not set |
| 963 | CONFIG_SND_SUPPORT_OLD_API=y | 961 | CONFIG_SND_SUPPORT_OLD_API=y |
| 962 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 964 | # CONFIG_SND_VERBOSE_PRINTK is not set | 963 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 965 | # CONFIG_SND_DEBUG is not set | 964 | # CONFIG_SND_DEBUG is not set |
| 966 | 965 | ||
| @@ -977,6 +976,7 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 977 | # PCI devices | 976 | # PCI devices |
| 978 | # | 977 | # |
| 979 | # CONFIG_SND_AD1889 is not set | 978 | # CONFIG_SND_AD1889 is not set |
| 979 | # CONFIG_SND_ALS300 is not set | ||
| 980 | # CONFIG_SND_ALS4000 is not set | 980 | # CONFIG_SND_ALS4000 is not set |
| 981 | # CONFIG_SND_ALI5451 is not set | 981 | # CONFIG_SND_ALI5451 is not set |
| 982 | # CONFIG_SND_ATIIXP is not set | 982 | # CONFIG_SND_ATIIXP is not set |
| @@ -1009,6 +1009,7 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 1009 | # CONFIG_SND_MIXART is not set | 1009 | # CONFIG_SND_MIXART is not set |
| 1010 | # CONFIG_SND_NM256 is not set | 1010 | # CONFIG_SND_NM256 is not set |
| 1011 | # CONFIG_SND_PCXHR is not set | 1011 | # CONFIG_SND_PCXHR is not set |
| 1012 | # CONFIG_SND_RIPTIDE is not set | ||
| 1012 | # CONFIG_SND_RME32 is not set | 1013 | # CONFIG_SND_RME32 is not set |
| 1013 | # CONFIG_SND_RME96 is not set | 1014 | # CONFIG_SND_RME96 is not set |
| 1014 | # CONFIG_SND_RME9652 is not set | 1015 | # CONFIG_SND_RME9652 is not set |
| @@ -1041,6 +1042,7 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1041 | # | 1042 | # |
| 1042 | CONFIG_USB_ARCH_HAS_HCD=y | 1043 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1043 | CONFIG_USB_ARCH_HAS_OHCI=y | 1044 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1045 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 1044 | CONFIG_USB=y | 1046 | CONFIG_USB=y |
| 1045 | # CONFIG_USB_DEBUG is not set | 1047 | # CONFIG_USB_DEBUG is not set |
| 1046 | 1048 | ||
| @@ -1068,7 +1070,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1068 | # | 1070 | # |
| 1069 | # USB Device Class drivers | 1071 | # USB Device Class drivers |
| 1070 | # | 1072 | # |
| 1071 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set | ||
| 1072 | CONFIG_USB_ACM=m | 1073 | CONFIG_USB_ACM=m |
| 1073 | CONFIG_USB_PRINTER=y | 1074 | CONFIG_USB_PRINTER=y |
| 1074 | 1075 | ||
| @@ -1126,15 +1127,6 @@ CONFIG_USB_HIDDEV=y | |||
| 1126 | # CONFIG_USB_MICROTEK is not set | 1127 | # CONFIG_USB_MICROTEK is not set |
| 1127 | 1128 | ||
| 1128 | # | 1129 | # |
| 1129 | # USB Multimedia devices | ||
| 1130 | # | ||
| 1131 | # CONFIG_USB_DABUSB is not set | ||
| 1132 | |||
| 1133 | # | ||
| 1134 | # Video4Linux support is needed for USB Multimedia device support | ||
| 1135 | # | ||
| 1136 | |||
| 1137 | # | ||
| 1138 | # USB Network Adapters | 1130 | # USB Network Adapters |
| 1139 | # | 1131 | # |
| 1140 | CONFIG_USB_CATC=m | 1132 | CONFIG_USB_CATC=m |
| @@ -1194,6 +1186,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1194 | CONFIG_USB_SERIAL_KLSI=m | 1186 | CONFIG_USB_SERIAL_KLSI=m |
| 1195 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 1187 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
| 1196 | CONFIG_USB_SERIAL_MCT_U232=m | 1188 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1189 | # CONFIG_USB_SERIAL_NAVMAN is not set | ||
| 1197 | CONFIG_USB_SERIAL_PL2303=m | 1190 | CONFIG_USB_SERIAL_PL2303=m |
| 1198 | # CONFIG_USB_SERIAL_HP4X is not set | 1191 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1199 | CONFIG_USB_SERIAL_SAFE=m | 1192 | CONFIG_USB_SERIAL_SAFE=m |
| @@ -1237,17 +1230,23 @@ CONFIG_USB_EZUSB=y | |||
| 1237 | # CONFIG_MMC is not set | 1230 | # CONFIG_MMC is not set |
| 1238 | 1231 | ||
| 1239 | # | 1232 | # |
| 1233 | # LED devices | ||
| 1234 | # | ||
| 1235 | # CONFIG_NEW_LEDS is not set | ||
| 1236 | |||
| 1237 | # | ||
| 1240 | # InfiniBand support | 1238 | # InfiniBand support |
| 1241 | # | 1239 | # |
| 1242 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1243 | 1241 | ||
| 1244 | # | 1242 | # |
| 1245 | # SN Devices | 1243 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1246 | # | 1244 | # |
| 1247 | 1245 | ||
| 1248 | # | 1246 | # |
| 1249 | # EDAC - error detection and reporting (RAS) | 1247 | # Real Time Clock |
| 1250 | # | 1248 | # |
| 1249 | # CONFIG_RTC_CLASS is not set | ||
| 1251 | 1250 | ||
| 1252 | # | 1251 | # |
| 1253 | # File systems | 1252 | # File systems |
| @@ -1319,7 +1318,6 @@ CONFIG_TMPFS=y | |||
| 1319 | CONFIG_HUGETLBFS=y | 1318 | CONFIG_HUGETLBFS=y |
| 1320 | CONFIG_HUGETLB_PAGE=y | 1319 | CONFIG_HUGETLB_PAGE=y |
| 1321 | CONFIG_RAMFS=y | 1320 | CONFIG_RAMFS=y |
| 1322 | # CONFIG_RELAYFS_FS is not set | ||
| 1323 | # CONFIG_CONFIGFS_FS is not set | 1321 | # CONFIG_CONFIGFS_FS is not set |
| 1324 | 1322 | ||
| 1325 | # | 1323 | # |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 1816a46742f6..a95e455a1944 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc6 | 3 | # Linux kernel version: 2.6.17-rc1 |
| 4 | # Wed Mar 15 16:19:52 2006 | 4 | # Wed Apr 19 11:46:44 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y | |||
| 9 | CONFIG_MMU=y | 9 | CONFIG_MMU=y |
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 12 | CONFIG_GENERIC_HWEIGHT=y | ||
| 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 13 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 13 | CONFIG_PPC=y | 14 | CONFIG_PPC=y |
| 14 | CONFIG_EARLY_PRINTK=y | 15 | CONFIG_EARLY_PRINTK=y |
| @@ -30,6 +31,7 @@ CONFIG_POWER4=y | |||
| 30 | CONFIG_PPC_FPU=y | 31 | CONFIG_PPC_FPU=y |
| 31 | # CONFIG_ALTIVEC is not set | 32 | # CONFIG_ALTIVEC is not set |
| 32 | CONFIG_PPC_STD_MMU=y | 33 | CONFIG_PPC_STD_MMU=y |
| 34 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 33 | CONFIG_SMP=y | 35 | CONFIG_SMP=y |
| 34 | CONFIG_NR_CPUS=32 | 36 | CONFIG_NR_CPUS=32 |
| 35 | 37 | ||
| @@ -55,6 +57,7 @@ CONFIG_AUDITSYSCALL=y | |||
| 55 | CONFIG_IKCONFIG=y | 57 | CONFIG_IKCONFIG=y |
| 56 | CONFIG_IKCONFIG_PROC=y | 58 | CONFIG_IKCONFIG_PROC=y |
| 57 | # CONFIG_CPUSETS is not set | 59 | # CONFIG_CPUSETS is not set |
| 60 | # CONFIG_RELAY is not set | ||
| 58 | CONFIG_INITRAMFS_SOURCE="" | 61 | CONFIG_INITRAMFS_SOURCE="" |
| 59 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 62 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 60 | # CONFIG_EMBEDDED is not set | 63 | # CONFIG_EMBEDDED is not set |
| @@ -69,10 +72,6 @@ CONFIG_BASE_FULL=y | |||
| 69 | CONFIG_FUTEX=y | 72 | CONFIG_FUTEX=y |
| 70 | CONFIG_EPOLL=y | 73 | CONFIG_EPOLL=y |
| 71 | CONFIG_SHMEM=y | 74 | CONFIG_SHMEM=y |
| 72 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 73 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 74 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 75 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 76 | CONFIG_SLAB=y | 75 | CONFIG_SLAB=y |
| 77 | # CONFIG_TINY_SHMEM is not set | 76 | # CONFIG_TINY_SHMEM is not set |
| 78 | CONFIG_BASE_SMALL=0 | 77 | CONFIG_BASE_SMALL=0 |
| @@ -84,7 +83,6 @@ CONFIG_BASE_SMALL=0 | |||
| 84 | CONFIG_MODULES=y | 83 | CONFIG_MODULES=y |
| 85 | CONFIG_MODULE_UNLOAD=y | 84 | CONFIG_MODULE_UNLOAD=y |
| 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 85 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 87 | CONFIG_OBSOLETE_MODPARM=y | ||
| 88 | CONFIG_MODVERSIONS=y | 86 | CONFIG_MODVERSIONS=y |
| 89 | CONFIG_MODULE_SRCVERSION_ALL=y | 87 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 90 | CONFIG_KMOD=y | 88 | CONFIG_KMOD=y |
| @@ -93,6 +91,7 @@ CONFIG_STOP_MACHINE=y | |||
| 93 | # | 91 | # |
| 94 | # Block layer | 92 | # Block layer |
| 95 | # | 93 | # |
| 94 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 96 | 95 | ||
| 97 | # | 96 | # |
| 98 | # IO Schedulers | 97 | # IO Schedulers |
| @@ -165,7 +164,6 @@ CONFIG_GENERIC_ISA_DMA=y | |||
| 165 | # CONFIG_PPC_INDIRECT_PCI is not set | 164 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 166 | CONFIG_PCI=y | 165 | CONFIG_PCI=y |
| 167 | CONFIG_PCI_DOMAINS=y | 166 | CONFIG_PCI_DOMAINS=y |
| 168 | CONFIG_PCI_LEGACY_PROC=y | ||
| 169 | # CONFIG_PCI_DEBUG is not set | 167 | # CONFIG_PCI_DEBUG is not set |
| 170 | 168 | ||
| 171 | # | 169 | # |
| @@ -207,6 +205,7 @@ CONFIG_SYN_COOKIES=y | |||
| 207 | CONFIG_INET_AH=m | 205 | CONFIG_INET_AH=m |
| 208 | CONFIG_INET_ESP=m | 206 | CONFIG_INET_ESP=m |
| 209 | CONFIG_INET_IPCOMP=m | 207 | CONFIG_INET_IPCOMP=m |
| 208 | CONFIG_INET_XFRM_TUNNEL=m | ||
| 210 | CONFIG_INET_TUNNEL=y | 209 | CONFIG_INET_TUNNEL=y |
| 211 | CONFIG_INET_DIAG=y | 210 | CONFIG_INET_DIAG=y |
| 212 | CONFIG_INET_TCP_DIAG=y | 211 | CONFIG_INET_TCP_DIAG=y |
| @@ -218,6 +217,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 218 | # | 217 | # |
| 219 | # CONFIG_IP_VS is not set | 218 | # CONFIG_IP_VS is not set |
| 220 | # CONFIG_IPV6 is not set | 219 | # CONFIG_IPV6 is not set |
| 220 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 221 | # CONFIG_INET6_TUNNEL is not set | ||
| 221 | CONFIG_NETFILTER=y | 222 | CONFIG_NETFILTER=y |
| 222 | # CONFIG_NETFILTER_DEBUG is not set | 223 | # CONFIG_NETFILTER_DEBUG is not set |
| 223 | 224 | ||
| @@ -236,11 +237,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | |||
| 236 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 237 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 237 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 238 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 238 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 239 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
| 240 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set | ||
| 239 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | 241 | CONFIG_NETFILTER_XT_MATCH_HELPER=m |
| 240 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 242 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 241 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 243 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| 242 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 244 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 243 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 245 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 246 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
| 247 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
| 244 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 248 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 245 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 249 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 246 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 250 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| @@ -262,20 +266,19 @@ CONFIG_IP_NF_IRC=m | |||
| 262 | CONFIG_IP_NF_TFTP=m | 266 | CONFIG_IP_NF_TFTP=m |
| 263 | CONFIG_IP_NF_AMANDA=m | 267 | CONFIG_IP_NF_AMANDA=m |
| 264 | # CONFIG_IP_NF_PPTP is not set | 268 | # CONFIG_IP_NF_PPTP is not set |
| 269 | # CONFIG_IP_NF_H323 is not set | ||
| 265 | CONFIG_IP_NF_QUEUE=m | 270 | CONFIG_IP_NF_QUEUE=m |
| 266 | CONFIG_IP_NF_IPTABLES=m | 271 | CONFIG_IP_NF_IPTABLES=m |
| 267 | CONFIG_IP_NF_MATCH_IPRANGE=m | 272 | CONFIG_IP_NF_MATCH_IPRANGE=m |
| 268 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 269 | CONFIG_IP_NF_MATCH_TOS=m | 273 | CONFIG_IP_NF_MATCH_TOS=m |
| 270 | CONFIG_IP_NF_MATCH_RECENT=m | 274 | CONFIG_IP_NF_MATCH_RECENT=m |
| 271 | CONFIG_IP_NF_MATCH_ECN=m | 275 | CONFIG_IP_NF_MATCH_ECN=m |
| 272 | CONFIG_IP_NF_MATCH_DSCP=m | 276 | CONFIG_IP_NF_MATCH_DSCP=m |
| 273 | CONFIG_IP_NF_MATCH_AH_ESP=m | 277 | # CONFIG_IP_NF_MATCH_AH is not set |
| 274 | CONFIG_IP_NF_MATCH_TTL=m | 278 | CONFIG_IP_NF_MATCH_TTL=m |
| 275 | CONFIG_IP_NF_MATCH_OWNER=m | 279 | CONFIG_IP_NF_MATCH_OWNER=m |
| 276 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | 280 | CONFIG_IP_NF_MATCH_ADDRTYPE=m |
| 277 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | 281 | CONFIG_IP_NF_MATCH_HASHLIMIT=m |
| 278 | CONFIG_IP_NF_MATCH_POLICY=m | ||
| 279 | CONFIG_IP_NF_FILTER=m | 282 | CONFIG_IP_NF_FILTER=m |
| 280 | CONFIG_IP_NF_TARGET_REJECT=m | 283 | CONFIG_IP_NF_TARGET_REJECT=m |
| 281 | CONFIG_IP_NF_TARGET_LOG=m | 284 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -479,6 +482,7 @@ CONFIG_MD_RAID0=y | |||
| 479 | CONFIG_MD_RAID1=y | 482 | CONFIG_MD_RAID1=y |
| 480 | CONFIG_MD_RAID10=m | 483 | CONFIG_MD_RAID10=m |
| 481 | CONFIG_MD_RAID5=y | 484 | CONFIG_MD_RAID5=y |
| 485 | # CONFIG_MD_RAID5_RESHAPE is not set | ||
| 482 | CONFIG_MD_RAID6=m | 486 | CONFIG_MD_RAID6=m |
| 483 | CONFIG_MD_MULTIPATH=m | 487 | CONFIG_MD_MULTIPATH=m |
| 484 | CONFIG_MD_FAULTY=m | 488 | CONFIG_MD_FAULTY=m |
| @@ -702,7 +706,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 702 | # Watchdog Cards | 706 | # Watchdog Cards |
| 703 | # | 707 | # |
| 704 | # CONFIG_WATCHDOG is not set | 708 | # CONFIG_WATCHDOG is not set |
| 705 | # CONFIG_RTC is not set | ||
| 706 | CONFIG_GEN_RTC=y | 709 | CONFIG_GEN_RTC=y |
| 707 | # CONFIG_GEN_RTC_X is not set | 710 | # CONFIG_GEN_RTC_X is not set |
| 708 | # CONFIG_DTLK is not set | 711 | # CONFIG_DTLK is not set |
| @@ -751,10 +754,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 751 | # | 754 | # |
| 752 | 755 | ||
| 753 | # | 756 | # |
| 754 | # Multimedia Capabilities Port drivers | ||
| 755 | # | ||
| 756 | |||
| 757 | # | ||
| 758 | # Multimedia devices | 757 | # Multimedia devices |
| 759 | # | 758 | # |
| 760 | # CONFIG_VIDEO_DEV is not set | 759 | # CONFIG_VIDEO_DEV is not set |
| @@ -779,6 +778,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 779 | # | 778 | # |
| 780 | CONFIG_USB_ARCH_HAS_HCD=y | 779 | CONFIG_USB_ARCH_HAS_HCD=y |
| 781 | CONFIG_USB_ARCH_HAS_OHCI=y | 780 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 781 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 782 | # CONFIG_USB is not set | 782 | # CONFIG_USB is not set |
| 783 | 783 | ||
| 784 | # | 784 | # |
| @@ -796,6 +796,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 796 | # CONFIG_MMC is not set | 796 | # CONFIG_MMC is not set |
| 797 | 797 | ||
| 798 | # | 798 | # |
| 799 | # LED devices | ||
| 800 | # | ||
| 801 | # CONFIG_NEW_LEDS is not set | ||
| 802 | |||
| 803 | # | ||
| 799 | # InfiniBand support | 804 | # InfiniBand support |
| 800 | # | 805 | # |
| 801 | # CONFIG_INFINIBAND is not set | 806 | # CONFIG_INFINIBAND is not set |
| @@ -805,6 +810,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 805 | # | 810 | # |
| 806 | 811 | ||
| 807 | # | 812 | # |
| 813 | # Real Time Clock | ||
| 814 | # | ||
| 815 | # CONFIG_RTC_CLASS is not set | ||
| 816 | |||
| 817 | # | ||
| 808 | # File systems | 818 | # File systems |
| 809 | # | 819 | # |
| 810 | CONFIG_EXT2_FS=y | 820 | CONFIG_EXT2_FS=y |
| @@ -878,7 +888,6 @@ CONFIG_TMPFS=y | |||
| 878 | # CONFIG_HUGETLBFS is not set | 888 | # CONFIG_HUGETLBFS is not set |
| 879 | # CONFIG_HUGETLB_PAGE is not set | 889 | # CONFIG_HUGETLB_PAGE is not set |
| 880 | CONFIG_RAMFS=y | 890 | CONFIG_RAMFS=y |
| 881 | # CONFIG_RELAYFS_FS is not set | ||
| 882 | # CONFIG_CONFIGFS_FS is not set | 891 | # CONFIG_CONFIGFS_FS is not set |
| 883 | 892 | ||
| 884 | # | 893 | # |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index daaf038a1faa..58e68ce09b0f 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc2 | 3 | # Linux kernel version: 2.6.17-rc1 |
| 4 | # Fri Feb 10 17:33:32 2006 | 4 | # Wed Apr 19 11:48:00 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y | |||
| 9 | CONFIG_MMU=y | 9 | CONFIG_MMU=y |
| 10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
| 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 12 | CONFIG_GENERIC_HWEIGHT=y | ||
| 12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 13 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 13 | CONFIG_PPC=y | 14 | CONFIG_PPC=y |
| 14 | CONFIG_EARLY_PRINTK=y | 15 | CONFIG_EARLY_PRINTK=y |
| @@ -30,6 +31,7 @@ CONFIG_POWER4=y | |||
| 30 | CONFIG_PPC_FPU=y | 31 | CONFIG_PPC_FPU=y |
| 31 | CONFIG_ALTIVEC=y | 32 | CONFIG_ALTIVEC=y |
| 32 | CONFIG_PPC_STD_MMU=y | 33 | CONFIG_PPC_STD_MMU=y |
| 34 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
| 33 | CONFIG_SMP=y | 35 | CONFIG_SMP=y |
| 34 | CONFIG_NR_CPUS=128 | 36 | CONFIG_NR_CPUS=128 |
| 35 | 37 | ||
| @@ -55,6 +57,7 @@ CONFIG_AUDITSYSCALL=y | |||
| 55 | CONFIG_IKCONFIG=y | 57 | CONFIG_IKCONFIG=y |
| 56 | CONFIG_IKCONFIG_PROC=y | 58 | CONFIG_IKCONFIG_PROC=y |
| 57 | CONFIG_CPUSETS=y | 59 | CONFIG_CPUSETS=y |
| 60 | # CONFIG_RELAY is not set | ||
| 58 | CONFIG_INITRAMFS_SOURCE="" | 61 | CONFIG_INITRAMFS_SOURCE="" |
| 59 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 62 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 60 | # CONFIG_EMBEDDED is not set | 63 | # CONFIG_EMBEDDED is not set |
| @@ -69,10 +72,6 @@ CONFIG_BASE_FULL=y | |||
| 69 | CONFIG_FUTEX=y | 72 | CONFIG_FUTEX=y |
| 70 | CONFIG_EPOLL=y | 73 | CONFIG_EPOLL=y |
| 71 | CONFIG_SHMEM=y | 74 | CONFIG_SHMEM=y |
| 72 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
| 73 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 74 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 75 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 76 | CONFIG_SLAB=y | 75 | CONFIG_SLAB=y |
| 77 | # CONFIG_TINY_SHMEM is not set | 76 | # CONFIG_TINY_SHMEM is not set |
| 78 | CONFIG_BASE_SMALL=0 | 77 | CONFIG_BASE_SMALL=0 |
| @@ -84,7 +83,6 @@ CONFIG_BASE_SMALL=0 | |||
| 84 | CONFIG_MODULES=y | 83 | CONFIG_MODULES=y |
| 85 | CONFIG_MODULE_UNLOAD=y | 84 | CONFIG_MODULE_UNLOAD=y |
| 86 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 85 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 87 | CONFIG_OBSOLETE_MODPARM=y | ||
| 88 | CONFIG_MODVERSIONS=y | 86 | CONFIG_MODVERSIONS=y |
| 89 | CONFIG_MODULE_SRCVERSION_ALL=y | 87 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 90 | CONFIG_KMOD=y | 88 | CONFIG_KMOD=y |
| @@ -93,6 +91,7 @@ CONFIG_STOP_MACHINE=y | |||
| 93 | # | 91 | # |
| 94 | # Block layer | 92 | # Block layer |
| 95 | # | 93 | # |
| 94 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 96 | 95 | ||
| 97 | # | 96 | # |
| 98 | # IO Schedulers | 97 | # IO Schedulers |
| @@ -188,7 +187,6 @@ CONFIG_PPC_I8259=y | |||
| 188 | # CONFIG_PPC_INDIRECT_PCI is not set | 187 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 189 | CONFIG_PCI=y | 188 | CONFIG_PCI=y |
| 190 | CONFIG_PCI_DOMAINS=y | 189 | CONFIG_PCI_DOMAINS=y |
| 191 | CONFIG_PCI_LEGACY_PROC=y | ||
| 192 | # CONFIG_PCI_DEBUG is not set | 190 | # CONFIG_PCI_DEBUG is not set |
| 193 | 191 | ||
| 194 | # | 192 | # |
| @@ -235,6 +233,7 @@ CONFIG_SYN_COOKIES=y | |||
| 235 | CONFIG_INET_AH=m | 233 | CONFIG_INET_AH=m |
| 236 | CONFIG_INET_ESP=m | 234 | CONFIG_INET_ESP=m |
| 237 | CONFIG_INET_IPCOMP=m | 235 | CONFIG_INET_IPCOMP=m |
| 236 | CONFIG_INET_XFRM_TUNNEL=m | ||
| 238 | CONFIG_INET_TUNNEL=y | 237 | CONFIG_INET_TUNNEL=y |
| 239 | CONFIG_INET_DIAG=y | 238 | CONFIG_INET_DIAG=y |
| 240 | CONFIG_INET_TCP_DIAG=y | 239 | CONFIG_INET_TCP_DIAG=y |
| @@ -246,6 +245,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 246 | # | 245 | # |
| 247 | # CONFIG_IP_VS is not set | 246 | # CONFIG_IP_VS is not set |
| 248 | # CONFIG_IPV6 is not set | 247 | # CONFIG_IPV6 is not set |
| 248 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 249 | # CONFIG_INET6_TUNNEL is not set | ||
| 249 | CONFIG_NETFILTER=y | 250 | CONFIG_NETFILTER=y |
| 250 | # CONFIG_NETFILTER_DEBUG is not set | 251 | # CONFIG_NETFILTER_DEBUG is not set |
| 251 | 252 | ||
| @@ -272,6 +273,7 @@ CONFIG_IP_NF_IRC=m | |||
| 272 | CONFIG_IP_NF_TFTP=m | 273 | CONFIG_IP_NF_TFTP=m |
| 273 | CONFIG_IP_NF_AMANDA=m | 274 | CONFIG_IP_NF_AMANDA=m |
| 274 | # CONFIG_IP_NF_PPTP is not set | 275 | # CONFIG_IP_NF_PPTP is not set |
| 276 | # CONFIG_IP_NF_H323 is not set | ||
| 275 | CONFIG_IP_NF_QUEUE=m | 277 | CONFIG_IP_NF_QUEUE=m |
| 276 | 278 | ||
| 277 | # | 279 | # |
| @@ -519,6 +521,7 @@ CONFIG_MD_RAID0=y | |||
| 519 | CONFIG_MD_RAID1=y | 521 | CONFIG_MD_RAID1=y |
| 520 | CONFIG_MD_RAID10=m | 522 | CONFIG_MD_RAID10=m |
| 521 | CONFIG_MD_RAID5=y | 523 | CONFIG_MD_RAID5=y |
| 524 | # CONFIG_MD_RAID5_RESHAPE is not set | ||
| 522 | CONFIG_MD_RAID6=m | 525 | CONFIG_MD_RAID6=m |
| 523 | CONFIG_MD_MULTIPATH=m | 526 | CONFIG_MD_MULTIPATH=m |
| 524 | CONFIG_MD_FAULTY=m | 527 | CONFIG_MD_FAULTY=m |
| @@ -750,6 +753,7 @@ CONFIG_HW_CONSOLE=y | |||
| 750 | # | 753 | # |
| 751 | CONFIG_SERIAL_8250=y | 754 | CONFIG_SERIAL_8250=y |
| 752 | CONFIG_SERIAL_8250_CONSOLE=y | 755 | CONFIG_SERIAL_8250_CONSOLE=y |
| 756 | CONFIG_SERIAL_8250_PCI=y | ||
| 753 | CONFIG_SERIAL_8250_NR_UARTS=4 | 757 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 754 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 758 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 755 | # CONFIG_SERIAL_8250_EXTENDED is not set | 759 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -767,7 +771,9 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 767 | # CONFIG_PRINTER is not set | 771 | # CONFIG_PRINTER is not set |
| 768 | # CONFIG_PPDEV is not set | 772 | # CONFIG_PPDEV is not set |
| 769 | # CONFIG_TIPAR is not set | 773 | # CONFIG_TIPAR is not set |
| 774 | CONFIG_HVC_DRIVER=y | ||
| 770 | CONFIG_HVC_CONSOLE=y | 775 | CONFIG_HVC_CONSOLE=y |
| 776 | # CONFIG_HVC_RTAS is not set | ||
| 771 | CONFIG_HVCS=m | 777 | CONFIG_HVCS=m |
| 772 | 778 | ||
| 773 | # | 779 | # |
| @@ -779,7 +785,6 @@ CONFIG_HVCS=m | |||
| 779 | # Watchdog Cards | 785 | # Watchdog Cards |
| 780 | # | 786 | # |
| 781 | # CONFIG_WATCHDOG is not set | 787 | # CONFIG_WATCHDOG is not set |
| 782 | # CONFIG_RTC is not set | ||
| 783 | CONFIG_GEN_RTC=y | 788 | CONFIG_GEN_RTC=y |
| 784 | # CONFIG_GEN_RTC_X is not set | 789 | # CONFIG_GEN_RTC_X is not set |
| 785 | # CONFIG_DTLK is not set | 790 | # CONFIG_DTLK is not set |
| @@ -830,7 +835,6 @@ CONFIG_I2C_ALGOBIT=y | |||
| 830 | # CONFIG_I2C_PARPORT_LIGHT is not set | 835 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 831 | # CONFIG_I2C_PROSAVAGE is not set | 836 | # CONFIG_I2C_PROSAVAGE is not set |
| 832 | # CONFIG_I2C_SAVAGE4 is not set | 837 | # CONFIG_I2C_SAVAGE4 is not set |
| 833 | # CONFIG_SCx200_ACB is not set | ||
| 834 | # CONFIG_I2C_SIS5595 is not set | 838 | # CONFIG_I2C_SIS5595 is not set |
| 835 | # CONFIG_I2C_SIS630 is not set | 839 | # CONFIG_I2C_SIS630 is not set |
| 836 | # CONFIG_I2C_SIS96X is not set | 840 | # CONFIG_I2C_SIS96X is not set |
| @@ -849,9 +853,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 849 | # CONFIG_SENSORS_PCF8574 is not set | 853 | # CONFIG_SENSORS_PCF8574 is not set |
| 850 | # CONFIG_SENSORS_PCA9539 is not set | 854 | # CONFIG_SENSORS_PCA9539 is not set |
| 851 | # CONFIG_SENSORS_PCF8591 is not set | 855 | # CONFIG_SENSORS_PCF8591 is not set |
| 852 | # CONFIG_SENSORS_RTC8564 is not set | ||
| 853 | # CONFIG_SENSORS_MAX6875 is not set | 856 | # CONFIG_SENSORS_MAX6875 is not set |
| 854 | # CONFIG_RTC_X1205_I2C is not set | ||
| 855 | # CONFIG_I2C_DEBUG_CORE is not set | 857 | # CONFIG_I2C_DEBUG_CORE is not set |
| 856 | # CONFIG_I2C_DEBUG_ALGO is not set | 858 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 857 | # CONFIG_I2C_DEBUG_BUS is not set | 859 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -879,10 +881,6 @@ CONFIG_I2C_ALGOBIT=y | |||
| 879 | # | 881 | # |
| 880 | 882 | ||
| 881 | # | 883 | # |
| 882 | # Multimedia Capabilities Port drivers | ||
| 883 | # | ||
| 884 | |||
| 885 | # | ||
| 886 | # Multimedia devices | 884 | # Multimedia devices |
| 887 | # | 885 | # |
| 888 | # CONFIG_VIDEO_DEV is not set | 886 | # CONFIG_VIDEO_DEV is not set |
| @@ -891,6 +889,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 891 | # Digital Video Broadcasting Devices | 889 | # Digital Video Broadcasting Devices |
| 892 | # | 890 | # |
| 893 | # CONFIG_DVB is not set | 891 | # CONFIG_DVB is not set |
| 892 | # CONFIG_USB_DABUSB is not set | ||
| 894 | 893 | ||
| 895 | # | 894 | # |
| 896 | # Graphics support | 895 | # Graphics support |
| @@ -900,6 +899,7 @@ CONFIG_FB_CFB_FILLRECT=y | |||
| 900 | CONFIG_FB_CFB_COPYAREA=y | 899 | CONFIG_FB_CFB_COPYAREA=y |
| 901 | CONFIG_FB_CFB_IMAGEBLIT=y | 900 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 902 | CONFIG_FB_MACMODES=y | 901 | CONFIG_FB_MACMODES=y |
| 902 | CONFIG_FB_FIRMWARE_EDID=y | ||
| 903 | CONFIG_FB_MODE_HELPERS=y | 903 | CONFIG_FB_MODE_HELPERS=y |
| 904 | CONFIG_FB_TILEBLITTING=y | 904 | CONFIG_FB_TILEBLITTING=y |
| 905 | # CONFIG_FB_CIRRUS is not set | 905 | # CONFIG_FB_CIRRUS is not set |
| @@ -919,7 +919,6 @@ CONFIG_FB_MATROX_MYSTIQUE=y | |||
| 919 | CONFIG_FB_MATROX_G=y | 919 | CONFIG_FB_MATROX_G=y |
| 920 | # CONFIG_FB_MATROX_I2C is not set | 920 | # CONFIG_FB_MATROX_I2C is not set |
| 921 | CONFIG_FB_MATROX_MULTIHEAD=y | 921 | CONFIG_FB_MATROX_MULTIHEAD=y |
| 922 | # CONFIG_FB_RADEON_OLD is not set | ||
| 923 | CONFIG_FB_RADEON=y | 922 | CONFIG_FB_RADEON=y |
| 924 | CONFIG_FB_RADEON_I2C=y | 923 | CONFIG_FB_RADEON_I2C=y |
| 925 | # CONFIG_FB_RADEON_DEBUG is not set | 924 | # CONFIG_FB_RADEON_DEBUG is not set |
| @@ -968,6 +967,7 @@ CONFIG_LCD_DEVICE=y | |||
| 968 | # | 967 | # |
| 969 | CONFIG_USB_ARCH_HAS_HCD=y | 968 | CONFIG_USB_ARCH_HAS_HCD=y |
| 970 | CONFIG_USB_ARCH_HAS_OHCI=y | 969 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 970 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 971 | CONFIG_USB=y | 971 | CONFIG_USB=y |
| 972 | # CONFIG_USB_DEBUG is not set | 972 | # CONFIG_USB_DEBUG is not set |
| 973 | 973 | ||
| @@ -1048,15 +1048,6 @@ CONFIG_USB_HIDDEV=y | |||
| 1048 | # CONFIG_USB_MICROTEK is not set | 1048 | # CONFIG_USB_MICROTEK is not set |
| 1049 | 1049 | ||
| 1050 | # | 1050 | # |
| 1051 | # USB Multimedia devices | ||
| 1052 | # | ||
| 1053 | # CONFIG_USB_DABUSB is not set | ||
| 1054 | |||
| 1055 | # | ||
| 1056 | # Video4Linux support is needed for USB Multimedia device support | ||
| 1057 | # | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # USB Network Adapters | 1051 | # USB Network Adapters |
| 1061 | # | 1052 | # |
| 1062 | # CONFIG_USB_CATC is not set | 1053 | # CONFIG_USB_CATC is not set |
| @@ -1109,6 +1100,11 @@ CONFIG_USB_MON=y | |||
| 1109 | # CONFIG_MMC is not set | 1100 | # CONFIG_MMC is not set |
| 1110 | 1101 | ||
| 1111 | # | 1102 | # |
| 1103 | # LED devices | ||
| 1104 | # | ||
| 1105 | # CONFIG_NEW_LEDS is not set | ||
| 1106 | |||
| 1107 | # | ||
| 1112 | # InfiniBand support | 1108 | # InfiniBand support |
| 1113 | # | 1109 | # |
| 1114 | CONFIG_INFINIBAND=m | 1110 | CONFIG_INFINIBAND=m |
| @@ -1121,12 +1117,13 @@ CONFIG_INFINIBAND_IPOIB=m | |||
| 1121 | # CONFIG_INFINIBAND_SRP is not set | 1117 | # CONFIG_INFINIBAND_SRP is not set |
| 1122 | 1118 | ||
| 1123 | # | 1119 | # |
| 1124 | # SN Devices | 1120 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| 1125 | # | 1121 | # |
| 1126 | 1122 | ||
| 1127 | # | 1123 | # |
| 1128 | # EDAC - error detection and reporting (RAS) | 1124 | # Real Time Clock |
| 1129 | # | 1125 | # |
| 1126 | # CONFIG_RTC_CLASS is not set | ||
| 1130 | 1127 | ||
| 1131 | # | 1128 | # |
| 1132 | # File systems | 1129 | # File systems |
| @@ -1202,7 +1199,6 @@ CONFIG_TMPFS=y | |||
| 1202 | CONFIG_HUGETLBFS=y | 1199 | CONFIG_HUGETLBFS=y |
| 1203 | CONFIG_HUGETLB_PAGE=y | 1200 | CONFIG_HUGETLB_PAGE=y |
| 1204 | CONFIG_RAMFS=y | 1201 | CONFIG_RAMFS=y |
| 1205 | # CONFIG_RELAYFS_FS is not set | ||
| 1206 | # CONFIG_CONFIGFS_FS is not set | 1202 | # CONFIG_CONFIGFS_FS is not set |
| 1207 | 1203 | ||
| 1208 | # | 1204 | # |
