[kernel] r5941 - in dists/trunk/linux-2.6/debian/arch: . alpha arm
m68k powerpc
Bastian Blank
waldi at costa.debian.org
Tue Feb 21 09:50:33 UTC 2006
Author: waldi
Date: Tue Feb 21 09:50:30 2006
New Revision: 5941
Modified:
dists/trunk/linux-2.6/debian/arch/alpha/config
dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
dists/trunk/linux-2.6/debian/arch/config
dists/trunk/linux-2.6/debian/arch/m68k/config
dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
dists/trunk/linux-2.6/debian/arch/m68k/config.atari
dists/trunk/linux-2.6/debian/arch/m68k/config.hp
dists/trunk/linux-2.6/debian/arch/m68k/config.mac
dists/trunk/linux-2.6/debian/arch/m68k/config.q40
dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
Log:
debian/arch: Remove duplicated options.
Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config Tue Feb 21 09:50:30 2006
@@ -970,7 +970,7 @@
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_ROCKETPORT=m
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
@@ -1693,7 +1693,6 @@
# CONFIG_IPW2100 is not set
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SENSORS_F71805F=m
-# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_ESPSERIAL=m
CONFIG_MOXA_INTELLIO=m
CONFIG_USB_SERIAL_WHITEHEAT=m
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge Tue Feb 21 09:50:30 2006
@@ -24,7 +24,6 @@
CONFIG_AUDIT=y
# CONFIG_IKCONFIG is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y
@@ -1107,23 +1106,23 @@
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
CONFIG_FB_CYBER2000=y
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
CONFIG_VIDEO_SELECT=y
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_RIVA=m
# CONFIG_FB_RADEON_OLD is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
+CONFIG_FB_RADEON=m
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SIS=m
+CONFIG_FB_NEOMAGIC=m
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
CONFIG_FB_CYBLA=m
@@ -1199,14 +1198,14 @@
#
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
#
# USB Input Devices
@@ -1214,7 +1213,7 @@
CONFIG_USB_HID=m
CONFIG_USB_HIDINPUT=y
# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
#
# USB HID Boot Protocol drivers
@@ -1588,7 +1587,6 @@
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_SL82C105=y
# CONFIG_SUNDANCE_MMIO is not set
-# CONFIG_USB_HIDDEV is not set
# CONFIG_SYNCLINK_CS is not set
CONFIG_PCMCIA_WL3501=m
CONFIG_BT_HIDP=m
@@ -1616,7 +1614,6 @@
CONFIG_PCMCIA_WAVELAN=m
# CONFIG_VIDEO_ZR36120 is not set
CONFIG_IEEE1394_ETH1394=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_INFTL is not set
CONFIG_WAVELAN=m
# CONFIG_PCMCIA_SYM53C500 is not set
@@ -1634,7 +1631,6 @@
CONFIG_PCMCIA_AXNET=m
CONFIG_IEEE1394_PCILYNX=m
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_USB_HIDINPUT=y
CONFIG_NET_PCMCIA=y
CONFIG_BLK_DEV_ALI15X3=m
# CONFIG_PCMCIA_AHA152X is not set
@@ -1650,10 +1646,8 @@
# CONFIG_DEV_APPLETALK is not set
CONFIG_PCMCIA_RAYCS=m
CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_PDC202XX_FORCE is not set
CONFIG_BT_RFCOMM_TTY=y
-CONFIG_USB_STORAGE_FREECOM=y
CONFIG_PCI_HERMES=m
CONFIG_CARDBUS=y
# CONFIG_BLK_DEV_HT6560B is not set
@@ -1674,12 +1668,9 @@
CONFIG_BT_BNEP=m
CONFIG_PCMCIA_XIRTULIP=m
CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_USB_STORAGE_ISD200=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
CONFIG_PCMCIA_NETWAVE=m
# CONFIG_SCSI_QLOGIC_ISP is not set
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_USB_STORAGE_SDDR09=y
CONFIG_IEEE1394_VIDEO1394=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BLK_DEV_CS5520=m
@@ -1696,7 +1687,6 @@
# CONFIG_PCMCIA_QLOGIC is not set
CONFIG_BLK_DEV_CS5530=m
# CONFIG_FTL is not set
-CONFIG_USB_STORAGE_JUMPSHOT=y
CONFIG_I82092=m
# CONFIG_8139TOO_8129 is not set
# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
@@ -1713,7 +1703,6 @@
CONFIG_AIRO=m
CONFIG_BLK_DEV_TRM290=m
# CONFIG_VIDEO_ZORAN is not set
-CONFIG_USB_STORAGE_SDDR55=y
# CONFIG_USB_SL811_CS is not set
CONFIG_HERMES=m
CONFIG_BLK_DEV_IDEDMA_PCI=y
@@ -1725,7 +1714,6 @@
CONFIG_IEEE1394_DV1394=m
CONFIG_PCMCIA_NMCLAN=m
CONFIG_BLK_DEV_PIIX=m
-CONFIG_USB_STORAGE_DPCM=y
CONFIG_BLK_DEV_GENERIC=m
CONFIG_BT_HCIDTL1=m
# CONFIG_IEEE1394_OUI_DB is not set
@@ -1733,20 +1721,15 @@
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_ATMEL=m
-CONFIG_DE2104X=m
# CONFIG_NCPFS_SMALLDOS is not set
-CONFIG_USB_STORAGE_USBAT=y
# CONFIG_NCPFS_STRONG is not set
CONFIG_BT_HCIUART_H4=y
# CONFIG_BLK_DEV_UMC8672 is not set
CONFIG_BT_HCIBTUART=m
CONFIG_PCMCIA=m
CONFIG_BROKEN=y
-# CONFIG_HID_FF is not set
-CONFIG_USB_STORAGE_DATAFAB=y
CONFIG_ARLAN=m
# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
# CONFIG_ATM_BR2684_IPFILTER is not set
CONFIG_BLK_DEV_HPT366=m
CONFIG_FS_MBCACHE=y
@@ -1757,12 +1740,10 @@
# CONFIG_IPX_INTERN is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
CONFIG_PCMCIA_SMC91C92=m
-CONFIG_DE4X5=m
CONFIG_PCMCIA_PCNET=m
CONFIG_BT_RFCOMM=m
CONFIG_BLK_DEV_HPT34X=m
CONFIG_BT_SCO=m
-# CONFIG_USB_STORAGE_DEBUG is not set
CONFIG_BT_HCIUSB_SCO=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_IEEE1394_RAWIO=m
@@ -1778,7 +1759,6 @@
CONFIG_VIDEO_TVEEPROM=m
# CONFIG_USB_AUDIO is not set
# CONFIG_PARPORT_SERIAL is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TUNER=m
# CONFIG_MEGARAID_MM is not set
@@ -1789,24 +1769,8 @@
# CONFIG_EQUALIZER is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_CASSINI is not set
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=y
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_VIDEO_SELECT=y
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
# CONFIG_FB_NVIDIA_I2C is not set
-CONFIG_FB_RIVA=m
# CONFIG_FB_RIVA_I2C is not set
# CONFIG_FB_RIVA_DEBUG is not set
CONFIG_FB_MATROX=m
@@ -1815,25 +1779,13 @@
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MULTIHEAD is not set
-# CONFIG_FB_RADEON_OLD is not set
-CONFIG_FB_RADEON=m
CONFIG_FB_RADEON_I2C=y
# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
CONFIG_FB_ATY_CT=y
-CONFIG_FB_SAVAGE=m
# CONFIG_FB_SAVAGE_I2C is not set
# CONFIG_FB_SAVAGE_ACCEL is not set
-CONFIG_FB_SIS=m
CONFIG_FB_SIS_300=y
CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_CYBLA=m
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VIRTUAL is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config (original)
+++ dists/trunk/linux-2.6/debian/arch/config Tue Feb 21 09:50:30 2006
@@ -105,10 +105,10 @@
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
CONFIG_SECCOMP=y
-CONFIG_TCG_TPM=m
+# CONFIG_TCG_TPM is not set
CONFIG_TCG_ATMEL=m
CONFIG_TCG_NSC=m
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
+CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
CONFIG_6PACK=m
CONFIG_DVB_USB_DTT200U=m
CONFIG_DVB_USB_DIGITV=m
@@ -218,7 +218,6 @@
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_NFS_COMMON=y
-# CONFIG_TCG_TPM is not set
CONFIG_USB_MON=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
CONFIG_BSD_PROCESS_ACCT=y
@@ -354,7 +353,6 @@
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
CONFIG_IP_ROUTE_MULTIPATH_RR=m
CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config Tue Feb 21 09:50:30 2006
@@ -1,12 +1,12 @@
# we don't trust the compiler, unfortunately, this does not fix the *vme* problems
-CONFIG_CC_OPTIMIZE_FOR_SIZE=n
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# build in SCSI for m68k
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
# disable ISCSI to avoid
# include/scsi/iscsi_if.h:241: error: syntax error before "volatile"
-CONFIG_SCSI_ISCSI_ATTRS=n
-CONFIG_ISCSI_TCP=n
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_ISCSI_TCP is not set
#
CONFIG_M68K=y
CONFIG_MMU=y
@@ -283,7 +283,7 @@
# CONFIG_INFINIBAND is not set
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
-CONFIG_EXT2_FS_XIP=n
+# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_JBD=y
@@ -352,8 +352,8 @@
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
-CONFIG_IEEE80211_CRYPT_CCMP=n
-CONFIG_IEEE80211_CRYPT_TKIP=n
-CONFIG_IEEE80211_CRYPT_WEP=n
-CONFIG_IEEE80211=n
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+# CONFIG_IEEE80211 is not set
# CONFIG_IPW2100 is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga Tue Feb 21 09:50:30 2006
@@ -41,7 +41,7 @@
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECD=y
# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
@@ -76,7 +76,7 @@
CONFIG_BLZ1230_SCSI=y
CONFIG_FASTLANE_SCSI=y
CONFIG_SCSI_AMIGA7XX=y
-CONFIG_OKTAGON_SCSI=n
+# CONFIG_OKTAGON_SCSI is not set
# CONFIG_SCSI_NCR53C7xx_FAST is not set
# CONFIG_CD_NO_IDESCSI is not set
# CONFIG_DM_MULTIPATH is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari Tue Feb 21 09:50:30 2006
@@ -33,7 +33,7 @@
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECD=y
# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp Tue Feb 21 09:50:30 2006
@@ -35,17 +35,17 @@
CONFIG_PPP_SYNC_TTY=m
# CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-CONFIG_KEYBOARD_HIL_OLD=n
-CONFIG_KEYBOARD_HIL=n
+# CONFIG_KEYBOARD_HIL_OLD is not set
+# CONFIG_KEYBOARD_HIL is not set
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_HIL=n
+# CONFIG_MOUSE_HIL is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_MISC is not set
CONFIG_SERIO=m
CONFIG_SERIO_SERPORT=m
-CONFIG_HP_SDC=n
-CONFIG_HIL_MLC=n
+# CONFIG_HP_SDC is not set
+# CONFIG_HIL_MLC is not set
CONFIG_SERIO_LIBPS2=m
# CONFIG_SERIAL_8250 is not set
CONFIG_GEN_RTC=y
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac Tue Feb 21 09:50:30 2006
@@ -1,4 +1,4 @@
-CONFIG_WINDFARM=n
+# CONFIG_WINDFARM is not set
CONFIG_CLEAN_COMPILE=y
# CONFIG_SUN3 is not set
# CONFIG_AMIGA is not set
@@ -28,7 +28,7 @@
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECD=y
# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40 (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40 Tue Feb 21 09:50:30 2006
@@ -29,7 +29,7 @@
# CONFIG_IDEDISK_MULTI_MODE is not set
CONFIG_BLK_DEV_IDECD=y
# disable IDETAPE, causes ICE
-CONFIG_BLK_DEV_IDETAPE=n
+# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot Tue Feb 21 09:50:30 2006
@@ -77,7 +77,6 @@
CONFIG_IOSCHED_DEADLINE=y
# CONFIG_IOSCHED_CFQ is not set
# CONFIG_DEFAULT_AS is not set
-CONFIG_DEFAULT_DEADLINE=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="deadline"
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Tue Feb 21 09:50:30 2006
@@ -46,7 +46,6 @@
# CONFIG_PMAC_PBOOK is not set
CONFIG_PMAC_SMU=y
# CONFIG_POWER4_ONLY is not set
-CONFIG_PPC64=y
# CONFIG_PPCDBG is not set
# CONFIG_PPC_ISERIES is not set
CONFIG_PPC_MAPLE=y
@@ -75,8 +74,6 @@
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_DISCONTIGMEM=y
CONFIG_IRQ_ALL_CPUS=y
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
@@ -84,10 +81,8 @@
CONFIG_NEED_MULTIPLE_NODES=y
CONFIG_XICS=y
CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_MEMORY_HOTPLUG is not set
# CONFIG_PPC_MPC106 is not set
CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_SPARSEMEM=y
CONFIG_PPC_MERGE=y
CONFIG_CELL_IIC=y
CONFIG_MMIO_NVRAM=y
@@ -96,9 +91,7 @@
CONFIG_GENERIC_TBSYNC=y
# CONFIG_EMBEDDED6xx is not set
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_HAVE_MEMORY_PRESENT=y
# CONFIG_PPC_64K_PAGES is not set
-CONFIG_SPARSEMEM_EXTREME=y
CONFIG_I2C_PMAC_SMU=y
# CONFIG_PPC_INDIRECT_PCI is not set
# CONFIG_PPC_82xx is not set
@@ -106,8 +99,6 @@
# CONFIG_PPC_83xx is not set
CONFIG_POWER3=y
CONFIG_POWER4=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
CONFIG_WINDFARM_PM91=m
CONFIG_WINDFARM_PM112=m
CONFIG_SPLIT_PTLOCK_CPUS=4096
More information about the Kernel-svn-changes
mailing list