From: Albert H. <he...@us...> - 2009-10-25 18:50:37
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/configs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/arch/powerpc/configs Modified Files: wii_defconfig Log Message: Merge gc-linux-v2.6.30. Index: wii_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/configs/wii_defconfig,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wii_defconfig 28 Mar 2009 20:44:19 -0000 1.11 --- wii_defconfig 25 Oct 2009 18:50:26 -0000 1.12 *************** *** 1,6 **** # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.29 ! # Sat Mar 28 19:45:24 2009 # # CONFIG_PPC64 is not set --- 1,6 ---- # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.30 ! # Fri Jun 26 21:19:27 2009 # # CONFIG_PPC64 is not set *************** *** 15,18 **** --- 15,19 ---- # CONFIG_44x is not set # CONFIG_E200 is not set + CONFIG_PPC_BOOK3S=y CONFIG_PPC_FPU=y # CONFIG_ALTIVEC is not set *************** *** 54,60 **** --- 55,63 ---- CONFIG_AUDIT_ARCH=y CONFIG_GENERIC_BUG=y + CONFIG_DTC=y # CONFIG_DEFAULT_UIMAGE is not set # CONFIG_PPC_DCR_NATIVE is not set # CONFIG_PPC_DCR_MMIO is not set + CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" *************** *** 99,102 **** --- 102,108 ---- CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" + CONFIG_RD_GZIP=y + # CONFIG_RD_BZIP2 is not set + # CONFIG_RD_LZMA is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y *************** *** 107,110 **** --- 113,117 ---- CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_EXTRA_PASS is not set + # CONFIG_STRIP_ASM_SYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y *************** *** 134,138 **** CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y ! # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y --- 141,146 ---- CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y ! # CONFIG_SLOW_WORK is not set ! CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y *************** *** 146,150 **** CONFIG_BLOCK=y CONFIG_LBD=y - # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set --- 154,157 ---- *************** *** 167,172 **** # Platform support # - CONFIG_PPC_MULTIPLATFORM=y - CONFIG_CLASSIC32=y # CONFIG_PPC_CHRP is not set # CONFIG_MPC5121_ADS is not set --- 174,177 ---- *************** *** 189,193 **** --- 194,201 ---- # CONFIG_GAMECUBE is not set CONFIG_WII=y + CONFIG_STARLET_IOS=y + CONFIG_STARLET_MINI=y CONFIG_FLIPPER_PIC=y + CONFIG_HOLLYWOOD_PIC=y CONFIG_GAMECUBE_COMMON=y CONFIG_GAMECUBE_UDBG=y *************** *** 196,199 **** --- 204,209 ---- CONFIG_GAMECUBE_RSW=y CONFIG_WII_GPIO=y + # CONFIG_AMIGAONE is not set + # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set # CONFIG_IPIC is not set # CONFIG_MPIC is not set *************** *** 253,259 **** --- 263,272 ---- CONFIG_VIRT_TO_BUS=y CONFIG_UNEVICTABLE_LRU=y + CONFIG_HAVE_MLOCK=y + CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_PPC_4K_PAGES=y # CONFIG_PPC_16K_PAGES is not set # CONFIG_PPC_64K_PAGES is not set + # CONFIG_PPC_256K_PAGES is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_PROC_DEVICETREE=y *************** *** 289,294 **** # CONFIG_TASK_SIZE_BOOL is not set CONFIG_TASK_SIZE=0xc0000000 - # CONFIG_CONSISTENT_START_BOOL is not set - CONFIG_CONSISTENT_START=0xff100000 # CONFIG_CONSISTENT_SIZE_BOOL is not set CONFIG_CONSISTENT_SIZE=0x00200000 --- 302,305 ---- *************** *** 298,302 **** # Networking options # - CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set --- 309,312 ---- *************** *** 347,350 **** --- 357,361 ---- # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set + # CONFIG_PHONET is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set *************** *** 354,357 **** --- 365,369 ---- # # CONFIG_NET_PKTGEN is not set + # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set *************** *** 371,374 **** --- 383,387 ---- # CONFIG_BT_HCIBTUSB=y + # CONFIG_BT_HCIBTSDIO is not set # CONFIG_BT_HCIUART is not set # CONFIG_BT_HCIBCM203X is not set *************** *** 377,381 **** # CONFIG_BT_HCIVHCI is not set # CONFIG_AF_RXRPC is not set - # CONFIG_PHONET is not set CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set --- 390,393 ---- *************** *** 410,414 **** CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_FD is not set ! CONFIG_GAMECUBE_SD=y CONFIG_WII_MEM2=m CONFIG_WII_SD=y --- 422,426 ---- CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_FD is not set ! CONFIG_GAMECUBE_SD=m CONFIG_WII_MEM2=m CONFIG_WII_SD=y *************** *** 429,432 **** --- 441,445 ---- # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set + # CONFIG_ISL29003 is not set # CONFIG_C2PORT is not set *************** *** 480,489 **** --- 493,505 ---- # CONFIG_ISCSI_TCP is not set # CONFIG_LIBFC is not set + # CONFIG_LIBFCOE is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_DH is not set + # CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_ATA is not set # CONFIG_MD is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y + CONFIG_COMPAT_NET_DEV_OPS=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set *************** *** 495,498 **** --- 511,515 ---- CONFIG_NET_ETHERNET=y CONFIG_MII=y + # CONFIG_ETHOC is not set # CONFIG_DNET is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set *************** *** 512,516 **** # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set - # CONFIG_IWLWIFI_LEDS is not set # --- 529,532 ---- *************** *** 528,531 **** --- 544,548 ---- CONFIG_USB_NET_AX8817X=y # CONFIG_USB_NET_CDCETHER is not set + # CONFIG_USB_NET_CDC_EEM is not set # CONFIG_USB_NET_DM9601 is not set # CONFIG_USB_NET_SMSC95XX is not set *************** *** 614,617 **** --- 631,635 ---- # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=y + # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # *************** *** 699,703 **** # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set - # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set --- 717,720 ---- *************** *** 816,819 **** --- 833,837 ---- # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set + # CONFIG_FB_BROADSHEET is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set *************** *** 840,843 **** --- 858,863 ---- CONFIG_SND_TIMER=y CONFIG_SND_PCM=y + CONFIG_SND_HWDEP=y + CONFIG_SND_RAWMIDI=y CONFIG_SND_SEQUENCER=y # CONFIG_SND_SEQ_DUMMY is not set *************** *** 861,865 **** CONFIG_SND_GAMECUBE=y CONFIG_SND_GAMECUBE_MIC=m ! # CONFIG_SND_USB is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set --- 881,889 ---- CONFIG_SND_GAMECUBE=y CONFIG_SND_GAMECUBE_MIC=m ! CONFIG_SND_USB=y ! CONFIG_SND_USB_AUDIO=y ! CONFIG_SND_USB_USX2Y=m ! CONFIG_SND_USB_CAIAQ=m ! # CONFIG_SND_USB_CAIAQ_INPUT is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set *************** *** 879,883 **** # Special HID drivers # - CONFIG_HID_COMPAT=y CONFIG_HID_A4TECH=m CONFIG_HID_APPLE=m --- 903,906 ---- *************** *** 886,891 **** --- 909,917 ---- CONFIG_HID_CHICONY=m CONFIG_HID_CYPRESS=m + CONFIG_DRAGONRISE_FF=m CONFIG_HID_EZKEY=m + CONFIG_HID_KYE=m CONFIG_HID_GYRATION=m + CONFIG_HID_KENSINGTON=m CONFIG_HID_LOGITECH=m # CONFIG_LOGITECH_FF is not set *************** *** 906,911 **** CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y ! # CONFIG_USB_ARCH_HAS_OHCI is not set ! # CONFIG_USB_ARCH_HAS_EHCI is not set CONFIG_USB=y # CONFIG_USB_DEBUG is not set --- 932,937 ---- CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y ! CONFIG_USB_ARCH_HAS_OHCI=y ! CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=y # CONFIG_USB_DEBUG is not set *************** *** 929,935 **** --- 955,972 ---- # # CONFIG_USB_C67X00_HCD is not set + CONFIG_USB_EHCI_HCD=y + # CONFIG_USB_EHCI_ROOT_HUB_TT is not set + # CONFIG_USB_EHCI_TT_NEWSCHED is not set + # CONFIG_USB_EHCI_HCD_PPC_OF is not set + CONFIG_USB_EHCI_HCD_MIPC=y # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set + CONFIG_USB_OHCI_HCD=y + # CONFIG_USB_OHCI_HCD_PPC_OF is not set + CONFIG_USB_OHCI_HCD_MIPC=y + # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set + # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set + CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set *************** *** 946,954 **** # ! # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; # # ! # see USB_STORAGE Help for more information # CONFIG_USB_STORAGE=y --- 983,991 ---- # ! # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # ! # also be needed; see USB_STORAGE Help for more info # CONFIG_USB_STORAGE=y *************** *** 992,999 **** # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set - # CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set --- 1029,1036 ---- # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set + # CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set *************** *** 1008,1012 **** # # CONFIG_USB_GPIO_VBUS is not set ! # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set --- 1045,1069 ---- # # CONFIG_USB_GPIO_VBUS is not set ! # CONFIG_NOP_USB_XCEIV is not set ! CONFIG_MMC=y ! # CONFIG_MMC_DEBUG is not set ! # CONFIG_MMC_UNSAFE_RESUME is not set ! ! # ! # MMC/SD/SDIO Card Drivers ! # ! CONFIG_MMC_BLOCK=y ! CONFIG_MMC_BLOCK_BOUNCE=y ! # CONFIG_SDIO_UART is not set ! # CONFIG_MMC_TEST is not set ! ! # ! # MMC/SD/SDIO Host Controller Drivers ! # ! CONFIG_MMC_SDHCI=y ! CONFIG_MMC_SDHCI_IO_ACCESSORS=y ! # CONFIG_MMC_SDHCI_OF is not set ! CONFIG_MMC_SDHCI_MIPC=y ! # CONFIG_MMC_WBSD is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set *************** *** 1068,1073 **** # on-CPU RTC drivers # ! # CONFIG_RTC_DRV_PPC is not set # CONFIG_DMADEVICES is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set --- 1125,1131 ---- # on-CPU RTC drivers # ! CONFIG_RTC_DRV_GENERIC=y # CONFIG_DMADEVICES is not set + # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set *************** *** 1080,1083 **** --- 1138,1142 ---- # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y + # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4_FS is not set *************** *** 1101,1104 **** --- 1160,1168 ---- # + # Caches + # + # CONFIG_FSCACHE is not set + + # # CD-ROM/DVD Filesystems # *************** *** 1148,1151 **** --- 1212,1216 ---- # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set + # CONFIG_NILFS2_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y *************** *** 1159,1163 **** CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y - # CONFIG_SUNRPC_REGISTER_V4 is not set # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set --- 1224,1227 ---- *************** *** 1214,1217 **** --- 1278,1282 ---- # CONFIG_NLS_UTF8 is not set # CONFIG_DLM is not set + CONFIG_BINARY_PRINTF=y # *************** *** 1227,1240 **** # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set ! CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_HAVE_LMB=y # # Kernel hacking # ! # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y --- 1292,1307 ---- # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set ! CONFIG_ZLIB_INFLATE=y ! CONFIG_DECOMPRESS_GZIP=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_HAVE_LMB=y + CONFIG_NLATTR=y # # Kernel hacking # ! CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y *************** *** 1249,1255 **** # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y ! # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set --- 1316,1323 ---- # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 + # CONFIG_DETECT_HUNG_TASK is not set CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y ! CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set *************** *** 1262,1266 **** CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set ! # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set --- 1330,1334 ---- CONFIG_STACKTRACE=y # CONFIG_DEBUG_KOBJECT is not set ! CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set *************** *** 1278,1287 **** --- 1346,1358 ---- CONFIG_LATENCYTOP=y CONFIG_SYSCTL_SYSCALL_CHECK=y + # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y + CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_RING_BUFFER=y CONFIG_TRACING=y + CONFIG_TRACING_SUPPORT=y # *************** *** 1292,1299 **** # CONFIG_SCHED_TRACER is not set CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_BOOT_TRACER=y # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_STACK_TRACER is not set ! # CONFIG_DYNAMIC_PRINTK_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y --- 1363,1375 ---- # CONFIG_SCHED_TRACER is not set CONFIG_CONTEXT_SWITCH_TRACER=y + # CONFIG_EVENT_TRACER is not set CONFIG_BOOT_TRACER=y # CONFIG_TRACE_BRANCH_PROFILING is not set # CONFIG_STACK_TRACER is not set ! # CONFIG_KMEMTRACE is not set ! # CONFIG_WORKQUEUE_TRACER is not set ! # CONFIG_BLK_DEV_IO_TRACE is not set ! # CONFIG_FTRACE_STARTUP_TEST is not set ! # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y *************** *** 1302,1306 **** # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set - # CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_CODE_PATCHING_SELFTEST is not set # CONFIG_FTR_FIXUP_SELFTEST is not set --- 1378,1381 ---- |