Menu
▾
▴
[Gc-linux-cvs] linux/arch/powerpc/configs gamecube_defconfig, 1.8, 1.9 wii_defconfig, 1.13, 1.14
|
From: Albert H. <he...@us...> - 2009-12-09 18:45:04
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/configs In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/arch/powerpc/configs Modified Files: gamecube_defconfig wii_defconfig Log Message: Merge v2.6.32. Index: wii_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/configs/wii_defconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wii_defconfig 25 Oct 2009 18:59:27 -0000 1.13 --- wii_defconfig 9 Dec 2009 18:44:54 -0000 1.14 *************** *** 1,6 **** # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.31 ! # Sun Sep 20 17:14:35 2009 # # CONFIG_PPC64 is not set --- 1,6 ---- # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.32 ! # Sun Dec 6 20:39:03 2009 # # CONFIG_PPC64 is not set *************** *** 37,40 **** --- 37,41 ---- CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set + # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set CONFIG_IRQ_PER_CPU=y CONFIG_STACKTRACE_SUPPORT=y *************** *** 75,79 **** CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="-isobel-wii" ! CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y --- 76,80 ---- CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="-isobel-wii" ! # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y *************** *** 87,95 **** # RCU Subsystem # ! CONFIG_CLASSIC_RCU=y ! # CONFIG_TREE_RCU is not set ! # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set - # CONFIG_PREEMPT_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y --- 88,97 ---- # RCU Subsystem # ! CONFIG_TREE_RCU=y ! # CONFIG_TREE_PREEMPT_RCU is not set ! # CONFIG_RCU_TRACE is not set ! CONFIG_RCU_FANOUT=32 ! # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y *************** *** 130,142 **** CONFIG_SHMEM=y CONFIG_AIO=y ! CONFIG_HAVE_PERF_COUNTERS=y # ! # Performance Counters # ! CONFIG_PERF_COUNTERS=y CONFIG_EVENT_PROFILE=y # CONFIG_VM_EVENT_COUNTERS is not set - # CONFIG_STRIP_ASM_SYMS is not set CONFIG_COMPAT_BRK=y CONFIG_SLAB=y --- 132,145 ---- CONFIG_SHMEM=y CONFIG_AIO=y ! CONFIG_HAVE_PERF_EVENTS=y # ! # Kernel Performance Events And Counters # ! CONFIG_PERF_EVENTS=y CONFIG_EVENT_PROFILE=y + CONFIG_PERF_COUNTERS=y + # CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_COMPAT_BRK=y CONFIG_SLAB=y *************** *** 145,149 **** # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y - CONFIG_MARKERS=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set --- 148,151 ---- *************** *** 153,156 **** --- 155,160 ---- CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y + CONFIG_HAVE_DMA_ATTRS=y + CONFIG_HAVE_DMA_API_DEBUG=y # *************** *** 158,162 **** # # CONFIG_GCOV_KERNEL is not set ! # CONFIG_SLOW_WORK is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y --- 162,167 ---- # # CONFIG_GCOV_KERNEL is not set ! CONFIG_SLOW_WORK=y ! # CONFIG_SLOW_WORK_DEBUG is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y *************** *** 214,218 **** CONFIG_STARLET_MINI=y CONFIG_FLIPPER_PIC=y ! CONFIG_HOLLYWOOD_PIC=y CONFIG_GAMECUBE_COMMON=y CONFIG_GAMECUBE_UDBG=y --- 219,223 ---- CONFIG_STARLET_MINI=y CONFIG_FLIPPER_PIC=y ! CONFIG_HLWD_PIC=y CONFIG_GAMECUBE_COMMON=y CONFIG_GAMECUBE_UDBG=y *************** *** 220,224 **** # CONFIG_GAMECUBE_VIDEO_UDBG is not set CONFIG_GAMECUBE_RSW=y ! CONFIG_WII_GPIO=y # CONFIG_AMIGAONE is not set # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set --- 225,229 ---- # CONFIG_GAMECUBE_VIDEO_UDBG is not set CONFIG_GAMECUBE_RSW=y ! CONFIG_HLWD_GPIO=y # CONFIG_AMIGAONE is not set # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set *************** *** 259,263 **** # CONFIG_IOMMU_HELPER is not set # CONFIG_SWIOTLB is not set - CONFIG_PPC_NEED_DMA_SYNC_OPS=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_HAS_WALK_MEMORY=y --- 264,267 ---- *************** *** 265,268 **** --- 269,273 ---- CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set + CONFIG_MAX_ACTIVE_REGIONS=32 CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_POPULATES_NODE_MAP=y *************** *** 282,285 **** --- 287,291 ---- CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y + # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_PPC_4K_PAGES=y *************** *** 362,365 **** --- 368,372 ---- # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set + # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set *************** *** 392,396 **** # CONFIG_BT_SCO is not set CONFIG_BT_RFCOMM=y ! # CONFIG_BT_RFCOMM_TTY is not set CONFIG_BT_BNEP=y CONFIG_BT_BNEP_MC_FILTER=y --- 399,403 ---- # CONFIG_BT_SCO is not set CONFIG_BT_RFCOMM=y ! CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=y CONFIG_BT_BNEP_MC_FILTER=y *************** *** 408,415 **** --- 415,427 ---- # CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIVHCI is not set + # CONFIG_BT_MRVL is not set # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y CONFIG_CFG80211=y + # CONFIG_NL80211_TESTMODE is not set + # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set + CONFIG_CFG80211_DEFAULT_PS=y + CONFIG_CFG80211_DEFAULT_PS_VALUE=1 # CONFIG_CFG80211_DEBUGFS is not set CONFIG_WIRELESS_OLD_REGULATORY=y *************** *** 418,427 **** # CONFIG_LIB80211 is not set CONFIG_MAC80211=y - CONFIG_MAC80211_DEFAULT_PS=y - CONFIG_MAC80211_DEFAULT_PS_VALUE=1 - - # - # Rate control algorithm selection - # # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y --- 430,433 ---- *************** *** 429,432 **** --- 435,439 ---- CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" + # CONFIG_MAC80211_MESH is not set # CONFIG_MAC80211_LEDS is not set # CONFIG_MAC80211_DEBUGFS is not set *************** *** 444,450 **** # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" # CONFIG_STANDALONE is not set CONFIG_PREVENT_FIRMWARE_BUILD=y ! # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set --- 451,460 ---- # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" + # CONFIG_DEVTMPFS is not set # CONFIG_STANDALONE is not set CONFIG_PREVENT_FIRMWARE_BUILD=y ! CONFIG_FW_LOADER=y ! # CONFIG_FIRMWARE_IN_KERNEL is not set ! CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set *************** *** 461,464 **** --- 471,475 ---- CONFIG_WII_MEM2=m CONFIG_WII_SD=y + CONFIG_WII_DI=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y *************** *** 554,565 **** # CONFIG_B44 is not set # CONFIG_KS8842 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set ! ! # ! # Wireless LAN ! # # CONFIG_WLAN_PRE80211 is not set ! # CONFIG_WLAN_80211 is not set # --- 565,596 ---- # CONFIG_B44 is not set # CONFIG_KS8842 is not set + # CONFIG_KS8851_MLL is not set + # CONFIG_XILINX_EMACLITE is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set ! CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set ! CONFIG_WLAN_80211=y ! # CONFIG_LIBERTAS is not set ! # CONFIG_LIBERTAS_THINFIRM is not set ! # CONFIG_AT76C50X_USB is not set ! # CONFIG_USB_ZD1201 is not set ! # CONFIG_USB_NET_RNDIS_WLAN is not set ! # CONFIG_RTL8187 is not set ! # CONFIG_MAC80211_HWSIM is not set ! # CONFIG_P54_COMMON is not set ! # CONFIG_ATH_COMMON is not set ! # CONFIG_HOSTAP is not set ! CONFIG_B43=y ! CONFIG_B43_SDIO=y ! CONFIG_B43_PIO=y ! # CONFIG_B43_PHY_LP is not set ! # CONFIG_B43_DEBUG is not set ! CONFIG_B43_DEFAULT_QOS_OFF=y ! # CONFIG_B43LEGACY is not set ! # CONFIG_ZD1211RW is not set ! # CONFIG_RT2X00 is not set ! # CONFIG_WL12XX is not set ! # CONFIG_IWM is not set # *************** *** 619,627 **** --- 650,662 ---- # CONFIG_INPUT_KEYBOARD=y + # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ATKBD is not set + # CONFIG_QT2160 is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_MATRIX is not set + # CONFIG_KEYBOARD_MAX7359 is not set # CONFIG_KEYBOARD_NEWTON is not set + # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set *************** *** 715,718 **** --- 750,754 ---- CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y + CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y *************** *** 750,756 **** # # CONFIG_DS1682 is not set - # CONFIG_SENSORS_PCF8574 is not set - # CONFIG_PCF8575 is not set - # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set --- 786,789 ---- *************** *** 793,801 **** # SPI GPIO expanders: # # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set - # CONFIG_THERMAL_HWMON is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y --- 826,837 ---- # SPI GPIO expanders: # + + # + # AC97 GPIO expanders: + # # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y *************** *** 804,808 **** # Sonics Silicon Backplane # ! # CONFIG_SSB is not set # --- 840,849 ---- # Sonics Silicon Backplane # ! CONFIG_SSB=y ! CONFIG_SSB_BLOCKIO=y ! CONFIG_SSB_SDIOHOST_POSSIBLE=y ! CONFIG_SSB_SDIOHOST=y ! # CONFIG_SSB_SILENT is not set ! CONFIG_SSB_DEBUG=y # *************** *** 817,820 **** --- 858,862 ---- # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_WM8400 is not set + # CONFIG_MFD_WM831X is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_PCF50633 is not set *************** *** 881,884 **** --- 923,927 ---- CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y + CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SND=y CONFIG_SND_TIMER=y *************** *** 921,925 **** CONFIG_HID_SUPPORT=y CONFIG_HID=y - # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set --- 964,967 ---- *************** *** 945,957 **** CONFIG_HID_KYE=m CONFIG_HID_GYRATION=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LOGITECH=m ! # CONFIG_LOGITECH_FF is not set ! # CONFIG_LOGIRUMBLEPAD2_FF is not set CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m ! # CONFIG_HID_NTRIG is not set CONFIG_HID_PANTHERLORD=m ! # CONFIG_PANTHERLORD_FF is not set CONFIG_HID_PETALYNX=m CONFIG_HID_SAMSUNG=m --- 987,1000 ---- CONFIG_HID_KYE=m CONFIG_HID_GYRATION=m + CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m CONFIG_HID_LOGITECH=m ! CONFIG_LOGITECH_FF=y ! CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m ! CONFIG_HID_NTRIG=m CONFIG_HID_PANTHERLORD=m ! CONFIG_PANTHERLORD_FF=y CONFIG_HID_PETALYNX=m CONFIG_HID_SAMSUNG=m *************** *** 959,966 **** CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m ! # CONFIG_GREENASIA_FF is not set CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y ! # CONFIG_HID_TOPSEED is not set CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y --- 1002,1009 ---- CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m ! CONFIG_GREENASIA_FF=y CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y ! CONFIG_HID_TOPSEED=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y *************** *** 997,1009 **** # 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_BE is not set # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set # 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 --- 1040,1054 ---- # CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_EHCI_HCD_PPC_OF is not set ! CONFIG_USB_EHCI_HCD_HLWD=y # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set + # CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set # CONFIG_USB_OHCI_HCD_PPC_OF is not set ! CONFIG_USB_OHCI_HCD_HLWD=y ! # CONFIG_USB_OHCI_HCD_SSB is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set *************** *** 1105,1110 **** # CONFIG_MMC_SDHCI_OF is not set # CONFIG_MMC_SDHCI_PLTFM 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 --- 1150,1157 ---- # CONFIG_MMC_SDHCI_OF is not set # CONFIG_MMC_SDHCI_PLTFM is not set ! CONFIG_MMC_SDHCI_HLWD=y # CONFIG_MMC_WBSD is not set + # CONFIG_MMC_AT91 is not set + # CONFIG_MMC_ATMELMCI is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set *************** *** 1196,1199 **** --- 1243,1247 ---- # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set + # CONFIG_NILFS2_FS is not set CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y *************** *** 1204,1208 **** # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set ! # CONFIG_FUSE_FS is not set # --- 1252,1257 ---- # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set ! CONFIG_FUSE_FS=m ! CONFIG_CUSE=m # *************** *** 1259,1263 **** # 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 --- 1308,1311 ---- *************** *** 1338,1342 **** CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC_CCITT=y ! # CONFIG_CRC16 is not set # CONFIG_CRC_T10DIF is not set # CONFIG_CRC_ITU_T is not set --- 1386,1390 ---- CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC_CCITT=y ! CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set # CONFIG_CRC_ITU_T is not set *************** *** 1361,1364 **** --- 1409,1413 ---- CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y + # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y *************** *** 1375,1378 **** --- 1424,1428 ---- # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set + # CONFIG_DEBUG_KMEMLEAK is not set CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set *************** *** 1395,1402 **** --- 1445,1454 ---- # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set + # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set + # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_FAULT_INJECTION is not set CONFIG_LATENCYTOP=y *************** *** 1431,1438 **** # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set - # CONFIG_KMEMCHECK is not set # CONFIG_PPC_DISABLE_WERROR is not set CONFIG_PPC_WERROR=y --- 1483,1490 ---- # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_DYNAMIC_DEBUG is not set + CONFIG_DMA_API_DEBUG=y # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_PPC_DISABLE_WERROR is not set CONFIG_PPC_WERROR=y *************** *** 1475,1479 **** # Crypto core or helper # - # CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y --- 1527,1530 ---- *************** *** 1516,1519 **** --- 1567,1571 ---- # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set + # CONFIG_CRYPTO_VMAC is not set # *************** *** 1521,1524 **** --- 1573,1577 ---- # # CONFIG_CRYPTO_CRC32C is not set + # CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set Index: gamecube_defconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/configs/gamecube_defconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gamecube_defconfig 25 Oct 2009 18:59:27 -0000 1.8 --- gamecube_defconfig 9 Dec 2009 18:44:54 -0000 1.9 *************** *** 1,6 **** # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.31 ! # Sun Sep 20 17:00:48 2009 # # CONFIG_PPC64 is not set --- 1,6 ---- # # Automatically generated make config: don't edit ! # Linux kernel version: 2.6.32 ! # Sun Dec 6 20:15:08 2009 # # CONFIG_PPC64 is not set *************** *** 37,40 **** --- 37,41 ---- CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set + # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set CONFIG_IRQ_PER_CPU=y CONFIG_STACKTRACE_SUPPORT=y *************** *** 86,94 **** # RCU Subsystem # ! CONFIG_CLASSIC_RCU=y ! # CONFIG_TREE_RCU is not set ! # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set - # CONFIG_PREEMPT_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y --- 87,96 ---- # RCU Subsystem # ! CONFIG_TREE_RCU=y ! # CONFIG_TREE_PREEMPT_RCU is not set ! # CONFIG_RCU_TRACE is not set ! CONFIG_RCU_FANOUT=32 ! # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y *************** *** 129,141 **** CONFIG_SHMEM=y CONFIG_AIO=y ! CONFIG_HAVE_PERF_COUNTERS=y # ! # Performance Counters # ! CONFIG_PERF_COUNTERS=y CONFIG_EVENT_PROFILE=y # CONFIG_VM_EVENT_COUNTERS is not set - # CONFIG_STRIP_ASM_SYMS is not set CONFIG_COMPAT_BRK=y CONFIG_SLAB=y --- 131,144 ---- CONFIG_SHMEM=y CONFIG_AIO=y ! CONFIG_HAVE_PERF_EVENTS=y # ! # Kernel Performance Events And Counters # ! CONFIG_PERF_EVENTS=y CONFIG_EVENT_PROFILE=y + CONFIG_PERF_COUNTERS=y + # CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_COMPAT_BRK=y CONFIG_SLAB=y *************** *** 144,148 **** # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y - CONFIG_MARKERS=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set --- 147,150 ---- *************** *** 152,155 **** --- 154,159 ---- CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y + CONFIG_HAVE_DMA_ATTRS=y + CONFIG_HAVE_DMA_API_DEBUG=y # *************** *** 157,161 **** # # CONFIG_GCOV_KERNEL is not set ! # CONFIG_SLOW_WORK is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y --- 161,166 ---- # # CONFIG_GCOV_KERNEL is not set ! CONFIG_SLOW_WORK=y ! # CONFIG_SLOW_WORK_DEBUG is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y *************** *** 254,258 **** # CONFIG_IOMMU_HELPER is not set # CONFIG_SWIOTLB is not set - CONFIG_PPC_NEED_DMA_SYNC_OPS=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_HAS_WALK_MEMORY=y --- 259,262 ---- *************** *** 260,263 **** --- 264,268 ---- CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set + CONFIG_MAX_ACTIVE_REGIONS=32 CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_POPULATES_NODE_MAP=y *************** *** 277,280 **** --- 282,286 ---- CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y + # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_PPC_4K_PAGES=y *************** *** 357,360 **** --- 363,367 ---- # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set + # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set *************** *** 398,401 **** --- 405,409 ---- # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" + # CONFIG_DEVTMPFS is not set # CONFIG_STANDALONE is not set CONFIG_PREVENT_FIRMWARE_BUILD=y *************** *** 469,480 **** # CONFIG_B44 is not set # CONFIG_KS8842 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set ! ! # ! # Wireless LAN ! # ! # CONFIG_WLAN_PRE80211 is not set ! # CONFIG_WLAN_80211 is not set # --- 477,485 ---- # CONFIG_B44 is not set # CONFIG_KS8842 is not set + # CONFIG_KS8851_MLL is not set + # CONFIG_XILINX_EMACLITE is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set ! # CONFIG_WLAN is not set # *************** *** 512,515 **** --- 517,521 ---- # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_NEWTON is not set + # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set *************** *** 603,607 **** # CONFIG_HWMON is not set # CONFIG_THERMAL is not set - # CONFIG_THERMAL_HWMON is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y --- 609,612 ---- *************** *** 683,686 **** --- 688,692 ---- CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y + CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SND=y CONFIG_SND_TIMER=y *************** *** 716,720 **** CONFIG_HID_SUPPORT=y CONFIG_HID=y - # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set # CONFIG_HID_PID is not set --- 722,725 ---- *************** *** 796,799 **** --- 801,805 ---- # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set + # CONFIG_NILFS2_FS is not set CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y *************** *** 859,863 **** # 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 --- 865,868 ---- *************** *** 961,964 **** --- 966,970 ---- CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set + # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y *************** *** 975,978 **** --- 981,985 ---- # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set + # CONFIG_DEBUG_KMEMLEAK is not set CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set *************** *** 995,1002 **** --- 1002,1011 ---- # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set + # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set + # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set # CONFIG_FAULT_INJECTION is not set CONFIG_LATENCYTOP=y *************** *** 1031,1038 **** # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set - # CONFIG_KMEMCHECK is not set # CONFIG_PPC_DISABLE_WERROR is not set CONFIG_PPC_WERROR=y --- 1040,1047 ---- # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_DYNAMIC_DEBUG is not set + # CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_PPC_DISABLE_WERROR is not set CONFIG_PPC_WERROR=y |
