tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] powerpc: Update pmac32_defconfig


Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by Benjamin Herrenschmidt and committed by Paul Mackerras 4683b54c 4c882b01

+60 -45
unified split
+60 -45
arch/powerpc/configs/pmac32_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.15-rc5 4 - # Tue Dec 13 17:24:05 2005 3 + # Linux kernel version: 2.6.15 4 + # Sat Jan 14 16:26:08 2006 5 5 # 6 6 # CONFIG_PPC64 is not set 7 7 CONFIG_PPC32=y ··· 15 15 CONFIG_GENERIC_NVRAM=y 16 16 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 17 17 CONFIG_ARCH_MAY_HAVE_PC_FDC=y 18 + CONFIG_PPC_OF=y 19 + # CONFIG_PPC_UDBG_16550 is not set 20 + # CONFIG_CRASH_DUMP is not set 21 + # CONFIG_GENERIC_TBSYNC is not set 18 22 19 23 # 20 24 # Processor support 21 25 # 22 - CONFIG_6xx=y 26 + CONFIG_CLASSIC32=y 23 27 # CONFIG_PPC_52xx is not set 24 28 # CONFIG_PPC_82xx is not set 25 29 # CONFIG_PPC_83xx is not set ··· 32 28 # CONFIG_8xx is not set 33 29 # CONFIG_E200 is not set 34 30 # CONFIG_E500 is not set 31 + CONFIG_6xx=y 35 32 CONFIG_PPC_FPU=y 36 33 CONFIG_ALTIVEC=y 37 34 CONFIG_PPC_STD_MMU=y ··· 58 53 # CONFIG_BSD_PROCESS_ACCT is not set 59 54 CONFIG_SYSCTL=y 60 55 # CONFIG_AUDIT is not set 61 - CONFIG_HOTPLUG=y 62 - CONFIG_KOBJECT_UEVENT=y 63 56 CONFIG_IKCONFIG=y 64 57 CONFIG_IKCONFIG_PROC=y 65 58 CONFIG_INITRAMFS_SOURCE="" 59 + # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 66 60 # CONFIG_EMBEDDED is not set 67 61 CONFIG_KALLSYMS=y 68 62 # CONFIG_KALLSYMS_ALL is not set 69 63 # CONFIG_KALLSYMS_EXTRA_PASS is not set 64 + CONFIG_HOTPLUG=y 70 65 CONFIG_PRINTK=y 71 66 CONFIG_BUG=y 67 + CONFIG_ELF_CORE=y 72 68 CONFIG_BASE_FULL=y 73 69 CONFIG_FUTEX=y 74 70 CONFIG_EPOLL=y ··· 78 72 CONFIG_CC_ALIGN_LABELS=0 79 73 CONFIG_CC_ALIGN_LOOPS=0 80 74 CONFIG_CC_ALIGN_JUMPS=0 75 + CONFIG_SLAB=y 81 76 # CONFIG_TINY_SHMEM is not set 82 77 CONFIG_BASE_SMALL=0 78 + # CONFIG_SLOB is not set 83 79 84 80 # 85 81 # Loadable module support ··· 121 113 # CONFIG_APUS is not set 122 114 # CONFIG_PPC_CHRP is not set 123 115 CONFIG_PPC_PMAC=y 124 - CONFIG_PPC_OF=y 125 116 CONFIG_MPIC=y 126 117 # CONFIG_PPC_RTAS is not set 127 118 # CONFIG_MMIO_NVRAM is not set 128 - # CONFIG_CRASH_DUMP is not set 129 119 CONFIG_PPC_MPC106=y 130 - # CONFIG_GENERIC_TBSYNC is not set 131 120 CONFIG_CPU_FREQ=y 132 121 CONFIG_CPU_FREQ_TABLE=y 133 122 # CONFIG_CPU_FREQ_DEBUG is not set ··· 200 195 # PC-card bridges 201 196 # 202 197 CONFIG_YENTA=m 198 + CONFIG_YENTA_O2=y 199 + CONFIG_YENTA_RICOH=y 200 + CONFIG_YENTA_TI=y 201 + CONFIG_YENTA_ENE_TUNE=y 202 + CONFIG_YENTA_TOSHIBA=y 203 203 # CONFIG_PD6729 is not set 204 204 # CONFIG_I82092 is not set 205 205 CONFIG_PCCARD_NONSTATIC=m ··· 474 464 # 475 465 # CONFIG_STANDALONE is not set 476 466 CONFIG_PREVENT_FIRMWARE_BUILD=y 477 - CONFIG_FW_LOADER=m 467 + CONFIG_FW_LOADER=y 478 468 # CONFIG_DEBUG_DRIVER is not set 479 469 480 470 # ··· 501 491 # Block devices 502 492 # 503 493 # CONFIG_BLK_DEV_FD is not set 504 - CONFIG_MAC_FLOPPY=y 494 + CONFIG_MAC_FLOPPY=m 505 495 # CONFIG_BLK_CPQ_DA is not set 506 496 # CONFIG_BLK_CPQ_CISS_DA is not set 507 497 # CONFIG_BLK_DEV_DAC960 is not set ··· 613 603 # SCSI Transport Attributes 614 604 # 615 605 CONFIG_SCSI_SPI_ATTRS=y 616 - # CONFIG_SCSI_FC_ATTRS is not set 606 + CONFIG_SCSI_FC_ATTRS=y 617 607 # CONFIG_SCSI_ISCSI_ATTRS is not set 618 608 # CONFIG_SCSI_SAS_ATTRS is not set 619 609 ··· 655 645 # CONFIG_SCSI_QLOGIC_FC is not set 656 646 # CONFIG_SCSI_QLOGIC_1280 is not set 657 647 CONFIG_SCSI_QLA2XXX=y 658 - # CONFIG_SCSI_QLA21XX is not set 659 - # CONFIG_SCSI_QLA22XX is not set 660 - # CONFIG_SCSI_QLA2300 is not set 661 - # CONFIG_SCSI_QLA2322 is not set 662 - # CONFIG_SCSI_QLA6312 is not set 663 - # CONFIG_SCSI_QLA24XX is not set 648 + # CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set 664 649 # CONFIG_SCSI_LPFC is not set 665 650 # CONFIG_SCSI_DC395x is not set 666 651 # CONFIG_SCSI_DC390T is not set ··· 663 658 # CONFIG_SCSI_DEBUG is not set 664 659 CONFIG_SCSI_MESH=y 665 660 CONFIG_SCSI_MESH_SYNC_RATE=5 666 - CONFIG_SCSI_MESH_RESET_DELAY_MS=1000 661 + CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 667 662 CONFIG_SCSI_MAC53C94=y 668 663 669 664 # ··· 732 727 CONFIG_IEEE1394_ETH1394=m 733 728 CONFIG_IEEE1394_DV1394=m 734 729 CONFIG_IEEE1394_RAWIO=m 735 - # CONFIG_IEEE1394_CMP is not set 736 730 737 731 # 738 732 # I2O device support ··· 744 740 CONFIG_ADB=y 745 741 CONFIG_ADB_CUDA=y 746 742 CONFIG_ADB_PMU=y 747 - CONFIG_PMAC_APM_EMU=y 743 + CONFIG_PMAC_APM_EMU=m 748 744 CONFIG_PMAC_MEDIABAY=y 749 745 CONFIG_PMAC_BACKLIGHT=y 750 746 CONFIG_INPUT_ADBHID=y ··· 823 819 # CONFIG_R8169 is not set 824 820 # CONFIG_SIS190 is not set 825 821 # CONFIG_SKGE is not set 822 + # CONFIG_SKY2 is not set 826 823 # CONFIG_SK98LIN is not set 827 824 # CONFIG_VIA_VELOCITY is not set 828 825 # CONFIG_TIGON3 is not set ··· 983 978 CONFIG_SERIAL_8250=m 984 979 # CONFIG_SERIAL_8250_CS is not set 985 980 CONFIG_SERIAL_8250_NR_UARTS=4 981 + CONFIG_SERIAL_8250_RUNTIME_UARTS=4 986 982 # CONFIG_SERIAL_8250_EXTENDED is not set 987 983 988 984 # 989 985 # Non-8250 serial port support 990 986 # 991 987 CONFIG_SERIAL_CORE=m 992 - # CONFIG_SERIAL_PMACZILOG is not set 993 - # CONFIG_SERIAL_JSM is not set 988 + CONFIG_SERIAL_PMACZILOG=m 994 989 CONFIG_UNIX98_PTYS=y 995 990 CONFIG_LEGACY_PTYS=y 996 991 CONFIG_LEGACY_PTY_COUNT=256 ··· 1063 1058 # CONFIG_I2C_I801 is not set 1064 1059 # CONFIG_I2C_I810 is not set 1065 1060 # CONFIG_I2C_PIIX4 is not set 1066 - CONFIG_I2C_KEYWEST=m 1061 + CONFIG_I2C_POWERMAC=y 1067 1062 # CONFIG_I2C_MPC is not set 1068 1063 # CONFIG_I2C_NFORCE2 is not set 1069 1064 # CONFIG_I2C_PARPORT_LIGHT is not set ··· 1165 1160 CONFIG_FB_ATY=y 1166 1161 CONFIG_FB_ATY_CT=y 1167 1162 # CONFIG_FB_ATY_GENERIC_LCD is not set 1168 - # CONFIG_FB_ATY_XL_INIT is not set 1169 1163 CONFIG_FB_ATY_GX=y 1170 1164 # CONFIG_FB_SAVAGE is not set 1171 1165 # CONFIG_FB_SIS is not set ··· 1173 1169 CONFIG_FB_3DFX=y 1174 1170 # CONFIG_FB_3DFX_ACCEL is not set 1175 1171 # CONFIG_FB_VOODOO1 is not set 1176 - # CONFIG_FB_CYBLA is not set 1177 1172 # CONFIG_FB_TRIDENT is not set 1178 1173 # CONFIG_FB_VIRTUAL is not set 1179 1174 ··· 1217 1214 CONFIG_SND_MIXER_OSS=m 1218 1215 CONFIG_SND_PCM_OSS=m 1219 1216 CONFIG_SND_SEQUENCER_OSS=y 1217 + # CONFIG_SND_DYNAMIC_MINORS is not set 1218 + CONFIG_SND_SUPPORT_OLD_API=y 1220 1219 # CONFIG_SND_VERBOSE_PRINTK is not set 1221 1220 # CONFIG_SND_DEBUG is not set 1222 - CONFIG_SND_GENERIC_DRIVER=y 1223 1221 1224 1222 # 1225 1223 # Generic devices ··· 1234 1230 # 1235 1231 # PCI devices 1236 1232 # 1233 + # CONFIG_SND_AD1889 is not set 1234 + # CONFIG_SND_ALS4000 is not set 1237 1235 # CONFIG_SND_ALI5451 is not set 1238 1236 # CONFIG_SND_ATIIXP is not set 1239 1237 # CONFIG_SND_ATIIXP_MODEM is not set ··· 1244 1238 # CONFIG_SND_AU8830 is not set 1245 1239 # CONFIG_SND_AZT3328 is not set 1246 1240 # CONFIG_SND_BT87X is not set 1247 - # CONFIG_SND_CS46XX is not set 1241 + # CONFIG_SND_CA0106 is not set 1242 + # CONFIG_SND_CMIPCI is not set 1248 1243 # CONFIG_SND_CS4281 is not set 1244 + # CONFIG_SND_CS46XX is not set 1249 1245 # CONFIG_SND_EMU10K1 is not set 1250 1246 # CONFIG_SND_EMU10K1X is not set 1251 - # CONFIG_SND_CA0106 is not set 1252 - # CONFIG_SND_KORG1212 is not set 1253 - # CONFIG_SND_MIXART is not set 1254 - # CONFIG_SND_NM256 is not set 1255 - # CONFIG_SND_RME32 is not set 1256 - # CONFIG_SND_RME96 is not set 1257 - # CONFIG_SND_RME9652 is not set 1258 - # CONFIG_SND_HDSP is not set 1259 - # CONFIG_SND_HDSPM is not set 1260 - # CONFIG_SND_TRIDENT is not set 1261 - # CONFIG_SND_YMFPCI is not set 1262 - # CONFIG_SND_AD1889 is not set 1263 - # CONFIG_SND_ALS4000 is not set 1264 - # CONFIG_SND_CMIPCI is not set 1265 1247 # CONFIG_SND_ENS1370 is not set 1266 1248 # CONFIG_SND_ENS1371 is not set 1267 1249 # CONFIG_SND_ES1938 is not set 1268 1250 # CONFIG_SND_ES1968 is not set 1269 - # CONFIG_SND_MAESTRO3 is not set 1270 1251 # CONFIG_SND_FM801 is not set 1252 + # CONFIG_SND_HDA_INTEL is not set 1253 + # CONFIG_SND_HDSP is not set 1254 + # CONFIG_SND_HDSPM is not set 1271 1255 # CONFIG_SND_ICE1712 is not set 1272 1256 # CONFIG_SND_ICE1724 is not set 1273 1257 # CONFIG_SND_INTEL8X0 is not set 1274 1258 # CONFIG_SND_INTEL8X0M is not set 1259 + # CONFIG_SND_KORG1212 is not set 1260 + # CONFIG_SND_MAESTRO3 is not set 1261 + # CONFIG_SND_MIXART is not set 1262 + # CONFIG_SND_NM256 is not set 1263 + # CONFIG_SND_PCXHR is not set 1264 + # CONFIG_SND_RME32 is not set 1265 + # CONFIG_SND_RME96 is not set 1266 + # CONFIG_SND_RME9652 is not set 1275 1267 # CONFIG_SND_SONICVIBES is not set 1268 + # CONFIG_SND_TRIDENT is not set 1276 1269 # CONFIG_SND_VIA82XX is not set 1277 1270 # CONFIG_SND_VIA82XX_MODEM is not set 1278 1271 # CONFIG_SND_VX222 is not set 1279 - # CONFIG_SND_HDA_INTEL is not set 1272 + # CONFIG_SND_YMFPCI is not set 1280 1273 1281 1274 # 1282 1275 # ALSA PowerMac devices 1283 1276 # 1284 1277 CONFIG_SND_POWERMAC=m 1285 - # CONFIG_SND_POWERMAC_AUTO_DRC is not set 1278 + CONFIG_SND_POWERMAC_AUTO_DRC=y 1286 1279 1287 1280 # 1288 1281 # USB devices ··· 1341 1336 # may also be needed; see USB_STORAGE Help for more information 1342 1337 # 1343 1338 # CONFIG_USB_STORAGE is not set 1339 + # CONFIG_USB_LIBUSUAL is not set 1344 1340 1345 1341 # 1346 1342 # USB Input Devices ··· 1361 1355 # CONFIG_USB_YEALINK is not set 1362 1356 # CONFIG_USB_XPAD is not set 1363 1357 # CONFIG_USB_ATI_REMOTE is not set 1358 + # CONFIG_USB_ATI_REMOTE2 is not set 1364 1359 # CONFIG_USB_KEYSPAN_REMOTE is not set 1365 1360 CONFIG_USB_APPLETOUCH=y 1366 1361 ··· 1508 1501 # CONFIG_JFS_FS is not set 1509 1502 # CONFIG_FS_POSIX_ACL is not set 1510 1503 # CONFIG_XFS_FS is not set 1504 + # CONFIG_OCFS2_FS is not set 1511 1505 # CONFIG_MINIX_FS is not set 1512 1506 # CONFIG_ROMFS_FS is not set 1513 1507 CONFIG_INOTIFY=y ··· 1548 1540 # CONFIG_HUGETLB_PAGE is not set 1549 1541 CONFIG_RAMFS=y 1550 1542 CONFIG_RELAYFS_FS=m 1543 + # CONFIG_CONFIGFS_FS is not set 1551 1544 1552 1545 # 1553 1546 # Miscellaneous filesystems ··· 1679 1670 # Kernel hacking 1680 1671 # 1681 1672 # CONFIG_PRINTK_TIME is not set 1682 - CONFIG_DEBUG_KERNEL=y 1683 1673 # CONFIG_MAGIC_SYSRQ is not set 1674 + CONFIG_DEBUG_KERNEL=y 1684 1675 CONFIG_LOG_BUF_SHIFT=14 1685 1676 CONFIG_DETECT_SOFTLOCKUP=y 1686 1677 # CONFIG_SCHEDSTATS is not set 1687 1678 # CONFIG_DEBUG_SLAB is not set 1679 + # CONFIG_DEBUG_MUTEXES is not set 1688 1680 # CONFIG_DEBUG_SPINLOCK is not set 1689 1681 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1690 1682 # CONFIG_DEBUG_KOBJECT is not set ··· 1698 1688 CONFIG_XMON_DEFAULT=y 1699 1689 # CONFIG_BDI_SWITCH is not set 1700 1690 CONFIG_BOOTX_TEXT=y 1691 + # CONFIG_PPC_EARLY_DEBUG_LPAR is not set 1692 + # CONFIG_PPC_EARLY_DEBUG_G5 is not set 1693 + # CONFIG_PPC_EARLY_DEBUG_RTAS is not set 1694 + # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set 1695 + # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set 1701 1696 1702 1697 # 1703 1698 # Security options