Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 553cbf0a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/ps3: Update ps3_defconfig
  powerpc/ps3: Update platform maintainer
  powerpc/pseries: Flush lazy kernel mappings after unplug operations
  powerpc/numa: Add form 1 NUMA affinity
  powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32
  powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
  powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED
  powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig
  powerpc/83xx: enable EPOLL syscall in defconfig
  powerpc/83xx: add RTC drivers in 83xx defconfig
  powerpc/fsl-cpm: Configure clock correctly for SCC
  powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS
  powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n
parents 27fb8d7b 76ad4b8e

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -4482,17 +4482,17 @@ S: Maintained 
F:	drivers/ata/sata_promise.*



PS3 NETWORK SUPPORT

M:	Geoff Levand <geoffrey.levand@am.sony.com>

M:	Geoff Levand <geoff@infradead.org>

L:	netdev@vger.kernel.org

L:	cbe-oss-dev@ozlabs.org

S:	Supported

S:	Maintained

F:	drivers/net/ps3_gelic_net.*



PS3 PLATFORM SUPPORT

M:	Geoff Levand <geoffrey.levand@am.sony.com>

M:	Geoff Levand <geoff@infradead.org>

L:	linuxppc-dev@ozlabs.org

L:	cbe-oss-dev@ozlabs.org

S:	Supported

S:	Maintained

F:	arch/powerpc/boot/ps3*

F:	arch/powerpc/include/asm/lv1call.h

F:	arch/powerpc/include/asm/ps3*.h

arch/powerpc/configs/83xx/asp8347_defconfig

+22 −22
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc3

# Wed Jan  6 09:24:14 2010

# Linux kernel version: 2.6.34-rc5

# Mon Apr 19 23:16:38 2010

#

# CONFIG_PPC64 is not set
@@ -97,14 +97,8 @@ CONFIG_RCU_FANOUT=32 
# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y

# CONFIG_FAIR_GROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y
@@ -112,6 +106,7 @@ CONFIG_INITRAMFS_SOURCE="" 
CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y
@@ -124,7 +119,7 @@ CONFIG_BUG=y 
CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

# CONFIG_EPOLL is not set

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y
@@ -325,6 +320,7 @@ CONFIG_ISA_DMA_API=y 
# Bus options

#

CONFIG_ZONE_DMA=y

# CONFIG_NEED_DMA_MAP_STATE is not set

CONFIG_GENERIC_ISA_DMA=y

CONFIG_PPC_INDIRECT_PCI=y

CONFIG_FSL_SOC=y
@@ -336,7 +332,6 @@ CONFIG_PCI_SYSCALL=y 
# CONFIG_PCIEPORTBUS is not set

CONFIG_ARCH_SUPPORTS_MSI=y

# CONFIG_PCI_MSI is not set

# CONFIG_PCI_LEGACY is not set

# CONFIG_PCI_STUB is not set

# CONFIG_PCI_IOV is not set

# CONFIG_PCCARD is not set
@@ -362,7 +357,6 @@ CONFIG_NET=y 
# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

CONFIG_XFRM_USER=m
@@ -543,6 +537,8 @@ CONFIG_MTD_PHYSMAP_OF=y 
# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

CONFIG_OF_FLATTREE=y

CONFIG_OF_DYNAMIC=y

CONFIG_OF_DEVICE=y

CONFIG_OF_I2C=y

CONFIG_OF_MDIO=y
@@ -579,6 +575,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_ISL29003 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_DS1682 is not set

# CONFIG_C2PORT is not set
@@ -596,6 +593,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_DMA is not set
@@ -788,6 +786,7 @@ CONFIG_SERIAL_CORE=y 
CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_OF_PLATFORM is not set

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -836,6 +835,7 @@ CONFIG_I2C_HELPER_AUTO=y 
CONFIG_I2C_MPC=y

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_XILINX is not set



#

# External I2C/SMBus adapter drivers
@@ -849,15 +849,9 @@ CONFIG_I2C_MPC=y 
#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set



#
@@ -883,10 +877,11 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7411 is not set

# CONFIG_SENSORS_ADT7462 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ADT7473 is not set

# CONFIG_SENSORS_ADT7475 is not set

# CONFIG_SENSORS_ASC7621 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_I5K_AMB is not set
@@ -923,6 +918,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_AMC6821 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_TMP401 is not set

# CONFIG_SENSORS_TMP421 is not set
@@ -971,18 +967,21 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_88PM860X is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_TWL4030_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_MAX8925 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_WM8994 is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_LPC_SCH is not set

# CONFIG_REGULATOR is not set

# CONFIG_MEDIA_SUPPORT is not set
@@ -991,6 +990,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_AGP is not set

CONFIG_VGA_ARB=y

CONFIG_VGA_ARB_MAX_GPUS=16

# CONFIG_DRM is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1083,7 +1083,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y 
# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_BERRY_CHARGE is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set
@@ -1096,7 +1095,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

# CONFIG_USB_GADGET is not set



#
@@ -1259,6 +1257,7 @@ CONFIG_JFFS2_ZLIB=y 
# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

# CONFIG_LOGFS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -1285,6 +1284,7 @@ CONFIG_SUNRPC_GSS=y 
CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CEPH_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

arch/powerpc/configs/83xx/kmeter1_defconfig

+15 −13
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc3

# Wed Jan  6 09:24:14 2010

# Linux kernel version: 2.6.34-rc5

# Mon Apr 19 23:16:39 2010

#

# CONFIG_PPC64 is not set
@@ -98,7 +98,6 @@ CONFIG_RCU_FANOUT=32 
# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_GROUP_SCHED is not set

# CONFIG_CGROUPS is not set

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set
@@ -318,6 +317,7 @@ CONFIG_ISA_DMA_API=y 
# Bus options

#

CONFIG_ZONE_DMA=y

# CONFIG_NEED_DMA_MAP_STATE is not set

CONFIG_GENERIC_ISA_DMA=y

CONFIG_FSL_SOC=y

CONFIG_PPC_PCI_CHOICE=y
@@ -346,7 +346,6 @@ CONFIG_NET=y 
# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y
@@ -387,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_ATM is not set

CONFIG_STP=m

CONFIG_BRIDGE=m

CONFIG_BRIDGE_IGMP_SNOOPING=y

# CONFIG_NET_DSA is not set

CONFIG_VLAN_8021Q=y

# CONFIG_VLAN_8021Q_GVRP is not set
@@ -539,6 +539,8 @@ CONFIG_MTD_UBI_DEBUG=y 
# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set

# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set

# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set

CONFIG_OF_FLATTREE=y

CONFIG_OF_DYNAMIC=y

CONFIG_OF_DEVICE=y

CONFIG_OF_I2C=y

CONFIG_OF_MDIO=y
@@ -563,6 +565,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_DMA is not set
@@ -690,6 +693,7 @@ CONFIG_SERIAL_CORE=y 
CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_OF_PLATFORM is not set

# CONFIG_SERIAL_QE is not set

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -720,6 +724,7 @@ CONFIG_I2C_HELPER_AUTO=y 
CONFIG_I2C_MPC=y

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_XILINX is not set



#

# External I2C/SMBus adapter drivers
@@ -732,15 +737,9 @@ CONFIG_I2C_MPC=y 
#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set



#
@@ -765,18 +764,20 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_88PM860X is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_TWL4030_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_MAX8925 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_WM8994 is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_REGULATOR is not set

# CONFIG_MEDIA_SUPPORT is not set
@@ -805,8 +806,6 @@ CONFIG_SSB_POSSIBLE=y 
CONFIG_UIO=y

# CONFIG_UIO_PDRV is not set

# CONFIG_UIO_PDRV_GENIRQ is not set

# CONFIG_UIO_SMX is not set

# CONFIG_UIO_SERCOS3 is not set



#

# TI VLYNQ
@@ -887,6 +886,7 @@ CONFIG_JFFS2_ZLIB=y 
CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

# CONFIG_UBIFS_FS is not set

# CONFIG_LOGFS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -911,6 +911,7 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CEPH_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set
@@ -976,6 +977,7 @@ CONFIG_DEBUG_FS=y 
CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_MEMORY_INIT is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_LKDTM is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_HAVE_FUNCTION_TRACER=y

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

+27 −22
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc3

# Wed Jan  6 09:24:15 2010

# Linux kernel version: 2.6.34-rc5

# Mon Apr 19 23:16:40 2010

#

# CONFIG_PPC64 is not set
@@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 
# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y

# CONFIG_FAIR_GROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y
@@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" 
CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y
@@ -123,7 +118,7 @@ CONFIG_BUG=y 
CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

# CONFIG_EPOLL is not set

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y
@@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y 
# Bus options

#

CONFIG_ZONE_DMA=y

# CONFIG_NEED_DMA_MAP_STATE is not set

CONFIG_GENERIC_ISA_DMA=y

CONFIG_PPC_INDIRECT_PCI=y

CONFIG_FSL_SOC=y
@@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y 
# CONFIG_PCIEPORTBUS is not set

CONFIG_ARCH_SUPPORTS_MSI=y

# CONFIG_PCI_MSI is not set

# CONFIG_PCI_LEGACY is not set

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCI_STUB is not set

# CONFIG_PCI_IOV is not set
@@ -362,7 +357,6 @@ CONFIG_NET=y 
# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set
@@ -556,6 +550,8 @@ CONFIG_MTD_NAND_FSL_ELBC=y 
# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

CONFIG_OF_FLATTREE=y

CONFIG_OF_DYNAMIC=y

CONFIG_OF_DEVICE=y

CONFIG_OF_I2C=y

CONFIG_OF_SPI=y
@@ -593,6 +589,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_ISL29003 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_DS1682 is not set

# CONFIG_TI_DAC7512 is not set

# CONFIG_C2PORT is not set
@@ -612,6 +609,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

CONFIG_SCSI_DMA=y
@@ -772,6 +770,7 @@ CONFIG_NET_PCI=y 
# CONFIG_PCNET32 is not set

# CONFIG_AMD8111_ETH is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_KSZ884X_PCI is not set

# CONFIG_B44 is not set

# CONFIG_FORCEDETH is not set

CONFIG_E100=y
@@ -824,6 +823,8 @@ CONFIG_NETDEV_10000=y 
# CONFIG_CHELSIO_T1 is not set

CONFIG_CHELSIO_T3_DEPENDS=y

# CONFIG_CHELSIO_T3 is not set

CONFIG_CHELSIO_T4_DEPENDS=y

# CONFIG_CHELSIO_T4 is not set

# CONFIG_ENIC is not set

# CONFIG_IXGBE is not set

# CONFIG_IXGB is not set
@@ -836,6 +837,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y 
# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_QLCNIC is not set

# CONFIG_QLGE is not set

# CONFIG_SFC is not set

# CONFIG_BE2NET is not set
@@ -931,6 +933,7 @@ CONFIG_SERIAL_CORE=y 
CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_OF_PLATFORM is not set

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -980,6 +983,7 @@ CONFIG_I2C_HELPER_AUTO=y 
CONFIG_I2C_MPC=y

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_XILINX is not set



#

# External I2C/SMBus adapter drivers
@@ -993,15 +997,9 @@ CONFIG_I2C_MPC=y 
#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y
@@ -1044,10 +1042,11 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7411 is not set

# CONFIG_SENSORS_ADT7462 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ADT7473 is not set

# CONFIG_SENSORS_ADT7475 is not set

# CONFIG_SENSORS_ASC7621 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_I5K_AMB is not set
@@ -1086,6 +1085,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_AMC6821 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_TMP401 is not set

# CONFIG_SENSORS_TMP421 is not set
@@ -1134,21 +1134,24 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_88PM860X is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_TWL4030_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_MAX8925 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_WM8994 is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_MFD_MC13783 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_EZX_PCAP is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_AB4500_CORE is not set

# CONFIG_LPC_SCH is not set

# CONFIG_REGULATOR is not set

# CONFIG_MEDIA_SUPPORT is not set
@@ -1157,6 +1160,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_AGP is not set

CONFIG_VGA_ARB=y

CONFIG_VGA_ARB_MAX_GPUS=16

# CONFIG_DRM is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1289,7 +1293,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_BERRY_CHARGE is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set
@@ -1302,7 +1305,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG is not set

# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1341,6 +1343,7 @@ CONFIG_USB_ETH_RNDIS=y 
# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_G_PRINTER is not set

# CONFIG_USB_CDC_COMPOSITE is not set

# CONFIG_USB_G_NOKIA is not set

# CONFIG_USB_G_MULTI is not set



#
@@ -1511,6 +1514,7 @@ CONFIG_JFFS2_ZLIB=y 
# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

# CONFIG_LOGFS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -1537,6 +1541,7 @@ CONFIG_SUNRPC_GSS=y 
CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CEPH_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

arch/powerpc/configs/83xx/mpc8315_rdb_defconfig

+28 −22
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc3

# Wed Jan  6 09:24:16 2010

# Linux kernel version: 2.6.34-rc5

# Mon Apr 19 23:16:40 2010

#

# CONFIG_PPC64 is not set
@@ -96,14 +96,8 @@ CONFIG_RCU_FANOUT=32 
# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y

# CONFIG_FAIR_GROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y
@@ -111,6 +105,7 @@ CONFIG_INITRAMFS_SOURCE="" 
CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y
@@ -123,7 +118,7 @@ CONFIG_BUG=y 
CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

# CONFIG_EPOLL is not set

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y
@@ -324,6 +319,7 @@ CONFIG_ISA_DMA_API=y 
# Bus options

#

CONFIG_ZONE_DMA=y

# CONFIG_NEED_DMA_MAP_STATE is not set

CONFIG_GENERIC_ISA_DMA=y

CONFIG_PPC_INDIRECT_PCI=y

CONFIG_FSL_SOC=y
@@ -335,7 +331,6 @@ CONFIG_PCI_SYSCALL=y 
# CONFIG_PCIEPORTBUS is not set

CONFIG_ARCH_SUPPORTS_MSI=y

# CONFIG_PCI_MSI is not set

# CONFIG_PCI_LEGACY is not set

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCI_STUB is not set

# CONFIG_PCI_IOV is not set
@@ -362,7 +357,6 @@ CONFIG_NET=y 
# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set
@@ -556,6 +550,8 @@ CONFIG_MTD_NAND_IDS=y 
# UBI - Unsorted block images

#

# CONFIG_MTD_UBI is not set

CONFIG_OF_FLATTREE=y

CONFIG_OF_DYNAMIC=y

CONFIG_OF_DEVICE=y

CONFIG_OF_I2C=y

CONFIG_OF_SPI=y
@@ -593,6 +589,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_ISL29003 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_DS1682 is not set

# CONFIG_TI_DAC7512 is not set

# CONFIG_C2PORT is not set
@@ -612,6 +609,7 @@ CONFIG_HAVE_IDE=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

CONFIG_SCSI_DMA=y
@@ -735,6 +733,7 @@ CONFIG_ATA_SFF=y 
# CONFIG_PATA_IT821X is not set

# CONFIG_PATA_IT8213 is not set

# CONFIG_PATA_JMICRON is not set

# CONFIG_PATA_LEGACY is not set

# CONFIG_PATA_TRIFLEX is not set

# CONFIG_PATA_MARVELL is not set

# CONFIG_PATA_MPIIX is not set
@@ -837,6 +836,7 @@ CONFIG_NET_PCI=y 
# CONFIG_PCNET32 is not set

# CONFIG_AMD8111_ETH is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_KSZ884X_PCI is not set

# CONFIG_B44 is not set

# CONFIG_FORCEDETH is not set

CONFIG_E100=y
@@ -889,6 +889,8 @@ CONFIG_NETDEV_10000=y 
# CONFIG_CHELSIO_T1 is not set

CONFIG_CHELSIO_T3_DEPENDS=y

# CONFIG_CHELSIO_T3 is not set

CONFIG_CHELSIO_T4_DEPENDS=y

# CONFIG_CHELSIO_T4 is not set

# CONFIG_ENIC is not set

# CONFIG_IXGBE is not set

# CONFIG_IXGB is not set
@@ -901,6 +903,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y 
# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_QLCNIC is not set

# CONFIG_QLGE is not set

# CONFIG_SFC is not set

# CONFIG_BE2NET is not set
@@ -996,6 +999,7 @@ CONFIG_SERIAL_CORE=y 
CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

# CONFIG_SERIAL_OF_PLATFORM is not set

# CONFIG_SERIAL_TIMBERDALE is not set

# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set

CONFIG_UNIX98_PTYS=y

# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -1045,6 +1049,7 @@ CONFIG_I2C_HELPER_AUTO=y 
CONFIG_I2C_MPC=y

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_XILINX is not set



#

# External I2C/SMBus adapter drivers
@@ -1058,15 +1063,9 @@ CONFIG_I2C_MPC=y 
#

# CONFIG_I2C_PCA_PLATFORM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y
@@ -1109,10 +1108,11 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7411 is not set

# CONFIG_SENSORS_ADT7462 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ADT7473 is not set

# CONFIG_SENSORS_ADT7475 is not set

# CONFIG_SENSORS_ASC7621 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_I5K_AMB is not set
@@ -1151,6 +1151,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_AMC6821 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_TMP401 is not set

# CONFIG_SENSORS_TMP421 is not set
@@ -1199,21 +1200,24 @@ CONFIG_SSB_POSSIBLE=y 
# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_88PM860X is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_TWL4030_CORE is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_MAX8925 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_WM8994 is not set

# CONFIG_MFD_PCF50633 is not set

# CONFIG_MFD_MC13783 is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_EZX_PCAP is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_AB4500_CORE is not set

# CONFIG_LPC_SCH is not set

# CONFIG_REGULATOR is not set

# CONFIG_MEDIA_SUPPORT is not set
@@ -1222,6 +1226,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_AGP is not set

CONFIG_VGA_ARB=y

CONFIG_VGA_ARB_MAX_GPUS=16

# CONFIG_DRM is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1354,7 +1359,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_BERRY_CHARGE is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set
@@ -1367,7 +1371,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG is not set

# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1406,6 +1409,7 @@ CONFIG_USB_ETH_RNDIS=y 
# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_G_PRINTER is not set

# CONFIG_USB_CDC_COMPOSITE is not set

# CONFIG_USB_G_NOKIA is not set

# CONFIG_USB_G_MULTI is not set



#
@@ -1576,6 +1580,7 @@ CONFIG_JFFS2_ZLIB=y 
# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

# CONFIG_LOGFS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -1602,6 +1607,7 @@ CONFIG_SUNRPC_GSS=y 
CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CEPH_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set