From: Anton Blanchard ppc64 defconfig update --- 25-akpm/arch/ppc64/configs/iSeries_defconfig | 24 ++++++++++++--- 25-akpm/arch/ppc64/configs/pSeries_defconfig | 42 +++++++++++++++++---------- 25-akpm/arch/ppc64/defconfig | 42 +++++++++++++++++---------- 3 files changed, 74 insertions(+), 34 deletions(-) diff -puN arch/ppc64/defconfig~ppc64-defconfig arch/ppc64/defconfig --- 25/arch/ppc64/defconfig~ppc64-defconfig 2004-03-14 15:35:17.953209280 -0800 +++ 25-akpm/arch/ppc64/defconfig 2004-03-14 15:35:17.959208368 -0800 @@ -47,6 +47,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_KMOD is not set +CONFIG_STOP_MACHINE=y # # Platform support @@ -60,6 +61,7 @@ CONFIG_ALTIVEC=y # CONFIG_PPC_PMAC is not set # CONFIG_BOOTX_TEXT is not set # CONFIG_POWER4_ONLY is not set +# CONFIG_IOMMU_VMERGE is not set CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_NR_CPUS=32 @@ -106,6 +108,7 @@ CONFIG_PROC_DEVICETREE=y # Generic Driver Options # CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set # # Memory Technology Devices (MTD) @@ -132,10 +135,10 @@ CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_CARMEL is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y -# CONFIG_DCSSBLK is not set # # ATA/ATAPI/MFM/RLL support @@ -173,7 +176,7 @@ CONFIG_IDEDMA_PCI_AUTO=y CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set +CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set # CONFIG_BLK_DEV_CY82C693 is not set @@ -222,6 +225,12 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set # +# SCSI Transport Attributes +# +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_FC_ATTRS=y + +# # SCSI low-level drivers # # CONFIG_BLK_DEV_3W_XXXX_RAID is not set @@ -273,7 +282,6 @@ CONFIG_MD_RAID5=y CONFIG_MD_RAID6=y # CONFIG_MD_MULTIPATH is not set CONFIG_BLK_DEV_DM=y -CONFIG_DM_IOCTL_V4=y CONFIG_DM_CRYPT=m # @@ -515,6 +523,7 @@ CONFIG_IBMOL=y # CONFIG_TMS380TR is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set +CONFIG_NETCONSOLE=y # # Wan interfaces @@ -535,6 +544,10 @@ CONFIG_IBMOL=y # Bluetooth support # # CONFIG_BT is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_RX=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem @@ -633,7 +646,6 @@ CONFIG_HVC_CONSOLE=y # Watchdog Cards # # CONFIG_WATCHDOG is not set -# CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set # CONFIG_DTLK is not set @@ -707,6 +719,10 @@ CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_DEBUG_CHIP is not set # +# Misc devices +# + +# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -720,6 +736,7 @@ CONFIG_I2C_ALGOBIT=y # Graphics support # CONFIG_FB=y +# CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set CONFIG_FB_OF=y # CONFIG_FB_CT65550 is not set @@ -776,7 +793,7 @@ CONFIG_LOGO_LINUX_CLUT224=y # # USB support # -CONFIG_USB=m +CONFIG_USB=y # CONFIG_USB_DEBUG is not set # @@ -789,8 +806,8 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y # CONFIG_USB_UHCI_HCD is not set # @@ -799,7 +816,7 @@ CONFIG_USB_OHCI_HCD=m # CONFIG_USB_BLUETOOTH_TTY is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set -CONFIG_USB_STORAGE=m +CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set @@ -813,16 +830,10 @@ CONFIG_USB_STORAGE=m # # USB Human Interface Devices (HID) # -CONFIG_USB_HID=m +CONFIG_USB_HID=y CONFIG_USB_HIDINPUT=y # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_KBTAB is not set @@ -1076,6 +1087,7 @@ CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_TEST=m diff -puN arch/ppc64/configs/iSeries_defconfig~ppc64-defconfig arch/ppc64/configs/iSeries_defconfig --- 25/arch/ppc64/configs/iSeries_defconfig~ppc64-defconfig 2004-03-14 15:35:17.954209128 -0800 +++ 25-akpm/arch/ppc64/configs/iSeries_defconfig 2004-03-14 15:35:17.960208216 -0800 @@ -47,6 +47,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_KMOD is not set +CONFIG_STOP_MACHINE=y # # Platform support @@ -56,6 +57,7 @@ CONFIG_PPC_ISERIES=y CONFIG_PPC=y CONFIG_PPC64=y # CONFIG_POWER4_ONLY is not set +# CONFIG_IOMMU_VMERGE is not set CONFIG_SMP=y CONFIG_NR_CPUS=32 CONFIG_MSCHUNKS=y @@ -89,6 +91,7 @@ CONFIG_PCI_NAMES=y # Generic Driver Options # CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set # # Memory Technology Devices (MTD) @@ -115,10 +118,10 @@ CONFIG_FW_LOADER=m CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_CARMEL is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y -# CONFIG_DCSSBLK is not set # # ATA/ATAPI/MFM/RLL support @@ -150,6 +153,12 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set # +# SCSI Transport Attributes +# +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_FC_ATTRS=y + +# # SCSI low-level drivers # # CONFIG_BLK_DEV_3W_XXXX_RAID is not set @@ -197,7 +206,6 @@ CONFIG_MD_RAID5=y CONFIG_MD_RAID6=y # CONFIG_MD_MULTIPATH is not set CONFIG_BLK_DEV_DM=y -CONFIG_DM_IOCTL_V4=y CONFIG_DM_CRYPT=m # @@ -437,6 +445,7 @@ CONFIG_IBMOL=y # CONFIG_TMS380TR is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set +CONFIG_NETCONSOLE=y # # Wan interfaces @@ -457,6 +466,10 @@ CONFIG_IBMOL=y # Bluetooth support # # CONFIG_BT is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_RX=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem @@ -535,7 +548,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # Watchdog Cards # # CONFIG_WATCHDOG is not set -# CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set # CONFIG_DTLK is not set @@ -556,6 +568,10 @@ CONFIG_MAX_RAW_DEVS=256 # CONFIG_I2C is not set # +# Misc devices +# + +# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -742,7 +758,6 @@ CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_VIOCONS=y CONFIG_VIODASD=y CONFIG_VIOCD=y -# CONFIG_VIOCD_AZTECH is not set # CONFIG_VIOTAPE is not set CONFIG_VIOPATH=y @@ -787,6 +802,7 @@ CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_TEST=m diff -puN arch/ppc64/configs/pSeries_defconfig~ppc64-defconfig arch/ppc64/configs/pSeries_defconfig --- 25/arch/ppc64/configs/pSeries_defconfig~ppc64-defconfig 2004-03-14 15:35:17.956208824 -0800 +++ 25-akpm/arch/ppc64/configs/pSeries_defconfig 2004-03-14 15:35:17.961208064 -0800 @@ -47,6 +47,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_KMOD is not set +CONFIG_STOP_MACHINE=y # # Platform support @@ -60,6 +61,7 @@ CONFIG_ALTIVEC=y # CONFIG_PPC_PMAC is not set # CONFIG_BOOTX_TEXT is not set # CONFIG_POWER4_ONLY is not set +# CONFIG_IOMMU_VMERGE is not set CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_NR_CPUS=32 @@ -106,6 +108,7 @@ CONFIG_PROC_DEVICETREE=y # Generic Driver Options # CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set # # Memory Technology Devices (MTD) @@ -132,10 +135,10 @@ CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_CARMEL is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_INITRD=y -# CONFIG_DCSSBLK is not set # # ATA/ATAPI/MFM/RLL support @@ -173,7 +176,7 @@ CONFIG_IDEDMA_PCI_AUTO=y CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set +CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set # CONFIG_BLK_DEV_CY82C693 is not set @@ -222,6 +225,12 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set # +# SCSI Transport Attributes +# +CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_FC_ATTRS=y + +# # SCSI low-level drivers # # CONFIG_BLK_DEV_3W_XXXX_RAID is not set @@ -273,7 +282,6 @@ CONFIG_MD_RAID5=y CONFIG_MD_RAID6=y # CONFIG_MD_MULTIPATH is not set CONFIG_BLK_DEV_DM=y -CONFIG_DM_IOCTL_V4=y CONFIG_DM_CRYPT=m # @@ -515,6 +523,7 @@ CONFIG_IBMOL=y # CONFIG_TMS380TR is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set +CONFIG_NETCONSOLE=y # # Wan interfaces @@ -535,6 +544,10 @@ CONFIG_IBMOL=y # Bluetooth support # # CONFIG_BT is not set +CONFIG_NETPOLL=y +CONFIG_NETPOLL_RX=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y # # ISDN subsystem @@ -633,7 +646,6 @@ CONFIG_HVC_CONSOLE=y # Watchdog Cards # # CONFIG_WATCHDOG is not set -# CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set # CONFIG_DTLK is not set @@ -707,6 +719,10 @@ CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_DEBUG_CHIP is not set # +# Misc devices +# + +# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -720,6 +736,7 @@ CONFIG_I2C_ALGOBIT=y # Graphics support # CONFIG_FB=y +# CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set CONFIG_FB_OF=y # CONFIG_FB_CT65550 is not set @@ -776,7 +793,7 @@ CONFIG_LOGO_LINUX_CLUT224=y # # USB support # -CONFIG_USB=m +CONFIG_USB=y # CONFIG_USB_DEBUG is not set # @@ -789,8 +806,8 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y # CONFIG_USB_UHCI_HCD is not set # @@ -799,7 +816,7 @@ CONFIG_USB_OHCI_HCD=m # CONFIG_USB_BLUETOOTH_TTY is not set # CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set -CONFIG_USB_STORAGE=m +CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set @@ -813,16 +830,10 @@ CONFIG_USB_STORAGE=m # # USB Human Interface Devices (HID) # -CONFIG_USB_HID=m +CONFIG_USB_HID=y CONFIG_USB_HIDINPUT=y # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_KBTAB is not set @@ -1076,6 +1087,7 @@ CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_TEST=m _