packages: kernel-vanilla/kernel-vanilla-multiarch.conf, kernel-vanilla/kern...

mmazur mmazur at pld-linux.org
Fri Nov 12 12:57:22 CET 2010


Author: mmazur                       Date: Fri Nov 12 11:57:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.6.36; rel 1
- includes a (hopefully) working config, at least for i386

---- Files affected:
packages/kernel-vanilla:
   kernel-vanilla-multiarch.conf (1.136 -> 1.137) , kernel-vanilla.spec (1.227 -> 1.228) 

---- Diffs:

================================================================
Index: packages/kernel-vanilla/kernel-vanilla-multiarch.conf
diff -u packages/kernel-vanilla/kernel-vanilla-multiarch.conf:1.136 packages/kernel-vanilla/kernel-vanilla-multiarch.conf:1.137
--- packages/kernel-vanilla/kernel-vanilla-multiarch.conf:1.136	Thu Jul  1 17:52:23 2010
+++ packages/kernel-vanilla/kernel-vanilla-multiarch.conf	Fri Nov 12 12:57:17 2010
@@ -7,7 +7,7 @@
 X86_32 i386=y x86_64=n
 X86_64 x86_64=y i386=n
 X86 i386=y x86_64=y
-GENERIC_TIME all=y alpha= sparc=
+GENERIC_TIME all=y alpha= sparc= i386=
 GENERIC_CMOS_UPDATE all=y alpha= sparc=
 CLOCKSOURCE_WATCHDOG x86_64=y i386=y
 GENERIC_CLOCKEVENTS all=y alpha= sparc=
@@ -25,9 +25,9 @@
 DMI i386=y x86_64=y
 RWSEM_GENERIC_SPINLOCK i386=n x86_64=n sparc=y
 RWSEM_XCHGADD_ALGORITHM ppc=y x86_64=y i386=y alpha=y
-ARCH_HAS_ILOG2_U32 i386=n x86_64= ppc=y alpha=n sparc=n
-ARCH_HAS_ILOG2_U64 i386=n x86_64= alpha=n sparc=n
-GENERIC_FIND_NEXT_BIT ppc=y alpha=y sparc=y x86_64=y
+ARCH_HAS_ILOG2_U32 i386= x86_64= ppc=y alpha=n sparc=n
+ARCH_HAS_ILOG2_U64 i386= x86_64= alpha=n sparc=n
+GENERIC_FIND_NEXT_BIT ppc=y alpha=y sparc=y x86_64=y i386=y
 GENERIC_CALIBRATE_DELAY i386=y x86_64=y ppc=y alpha=y sparc=y
 GENERIC_TIME_VSYSCALL all=y i386=n alpha= sparc=
 ARCH_SUPPORTS_OPROFILE all=y ppc= sparc= i386= x86_64=
@@ -38,9 +38,9 @@
 GENERIC_IRQ_PROBE i386=y x86_64=y alpha=y
 AUTO_IRQ_AFFINITY alpha=y
 GENERIC_PENDING_IRQ i386=y x86_64=y
-X86_SMP i386=y x86_64=
+X86_SMP i386= x86_64=
 X86_HT i386=y x86_64=y
-X86_BIOS_REBOOT i386=y x86_64=
+X86_BIOS_REBOOT i386= x86_64=
 X86_TRAMPOLINE i386=y x86_64=y
 KTIME_SCALAR i386=y x86_64=n
 DEFCONFIG_LIST all="/lib/modules/$UNAME_RELEASE/.config"
@@ -80,7 +80,7 @@
 CGROUP_NS all=y
 CGROUP_FREEZER all=n
 CPUSETS all=y
-FAIR_GROUP_SCHED all=y x86_64=
+FAIR_GROUP_SCHED all=y x86_64= i386=
 FAIR_USER_SCHED all=y i386= x86_64= ppc=
 FAIR_CGROUP_SCHED all=n i386= x86_64= ppc=
 CGROUP_CPUACCT all=y
@@ -100,7 +100,7 @@
 KALLSYMS_EXTRA_PASS all=y
 HOTPLUG all=y
 PRINTK all=y
-DYNAMIC_PRINTK_DEBUG all=n x86_64=
+DYNAMIC_PRINTK_DEBUG all=n x86_64= i386=
 BUG all=y
 ELF_CORE all=y
 BASE_FULL all=y
@@ -113,22 +113,22 @@
 VM_EVENT_COUNTERS all=y
 SLAB all=y
 SLUB all=n
-SLOB all=n
+SLOB all=n i386=
 SLABINFO all=y
 RT_MUTEXES all=y
-TINY_SHMEM all=n x86_64=
+TINY_SHMEM all=n x86_64= i386=
 BASE_SMALL all=0
 MODULES all=y
 MODULE_UNLOAD all=y
 MODULE_FORCE_UNLOAD all=y
 MODVERSIONS all=n
 MODULE_SRCVERSION_ALL all=n
-KMOD all=y x86_64=
+KMOD all=y x86_64= i386=
 STOP_MACHINE all=y
 BLOCK all=y
-LBD all=y x86_64=
+LBD all=y x86_64= i386=
 BLK_DEV_IO_TRACE ppc=y x86_64=y sparc64=y i386=y alpha=y sparc=n
-LSF all=y x86_64=
+LSF all=y x86_64= i386=
 BLK_DEV_BSG all=y
 BLOCK_COMPAT all=y ppc= i386= sparc=
 LBDAF i386=y
@@ -137,14 +137,14 @@
 # IO Schedulers
 #
 IOSCHED_NOOP all=y
-IOSCHED_AS all=y x86_64=
+IOSCHED_AS all=y x86_64= i386=
 IOSCHED_DEADLINE all=y
-IOSCHED_CFQ all=y
-DEFAULT_AS all=n x86_64=
-DEFAULT_DEADLINE all=n
-DEFAULT_CFQ all=y
+IOSCHED_CFQ all=y i386=m
+DEFAULT_AS all=n x86_64= i386=
+DEFAULT_DEADLINE all=n i386=y
+DEFAULT_CFQ all=y i386=n
 DEFAULT_NOOP all=n
-DEFAULT_IOSCHED all="cfq"
+DEFAULT_IOSCHED all="cfq" i386="deadline"
 PREEMPT_NOTIFIERS all=y ppc= sparc=
 
 #
@@ -198,19 +198,19 @@
 GENERIC_CLOCKEVENTS_BUILD all=y alpha= sparc=
 SMP all=y
 SPARSE_IRQ all=y
-X86_PC i386=y x86_64=
-X86_ELAN i386=n x86_64=
-X86_VOYAGER i386=n x86_64=
-X86_NUMAQ i386=n x86_64=
-X86_SUMMIT i386=n x86_64=
+X86_PC i386= x86_64=
+X86_ELAN i386= x86_64=
+X86_VOYAGER i386= x86_64=
+X86_NUMAQ i386= x86_64=
+X86_SUMMIT i386= x86_64=
 X86_BIGSMP all=n x86_64=
-X86_VISWS i386=n x86_64=
-X86_GENERICARCH i386=n x86_64=
-X86_ES7000 i386=n x86_64=
-X86_VSMP x86_64= i386=n
-SCHED_NO_NO_OMIT_FRAME_POINTER all=y ppc=y alpha= sparc= x86_64=
+X86_VISWS i386= x86_64=
+X86_GENERICARCH i386= x86_64=
+X86_ES7000 i386= x86_64=
+X86_VSMP x86_64= i386=
+SCHED_NO_NO_OMIT_FRAME_POINTER all=y ppc=y alpha= sparc= x86_64= i386=
 PARAVIRT_GUEST i386=n x86_64=y
-PARAVIRT_SPINLOCKS i386=n x86_64=n
+PARAVIRT_SPINLOCKS i386= x86_64=n
 M386 i386=n x86_64=n
 M486 i386=n x86_64=n
 M586 i386=n x86_64=n
@@ -228,34 +228,34 @@
 MCRUSOE i386=n x86_64=n
 MEFFICEON i386=n x86_64=n
 MWINCHIPC6 i386=n x86_64=n
-MWINCHIP2 i386=n x86_64=
+MWINCHIP2 i386= x86_64=
 MWINCHIP3D i386=n x86_64=n
 MGEODEGX1 i386=n x86_64=n
 MGEODE_LX i386=n x86_64=n
 MCYRIXIII i386=n x86_64=n
 MVIAC3_2 i386=n x86_64=n
 MVIAC7 i386=n x86_64=n
-MPSC x86_64=n i386=n
+MPSC x86_64=n i386=
 MCORE2 i386=n x86_64=n
-GENERIC_CPU x86_64=n i386=n
+GENERIC_CPU x86_64=n i386=
 X86_GENERIC i386=y
 X86_L1_CACHE_BYTES x86_64=
 X86_INTERNODE_CACHE_BYTES x86_64=
 X86_CMPXCHG x86_64=y i386=y
-X86_L1_CACHE_SHIFT i386=7 x86_64=6
+X86_L1_CACHE_SHIFT i386=6 x86_64=6
 X86_XADD i386=y x86_64=y
 X86_PPRO_FENCE i386=y
 X86_WP_WORKS_OK i386=y x86_64=y
 X86_INVLPG i386=y
 X86_BSWAP i386=y
 X86_POPAD_OK i386=y
-X86_GOOD_APIC x86_64= i386=y
+X86_GOOD_APIC x86_64= i386=
 X86_INTEL_USERCOPY i386=y x86_64=y
 X86_USE_PPRO_CHECKSUM x86_64=y i386=y
 X86_USE_3DNOW i386=
 X86_TSC x86_64=y i386=y
 X86_CMOV i386=y x86_64=y
-X86_MINIMUM_CPU_FAMILY x86_64=64 i386=4
+X86_MINIMUM_CPU_FAMILY x86_64=64 i386=5
 HPET_TIMER i386=y x86_64=y
 NR_CPUS i386=8 x86_64=64 ppc=32 alpha=32 sparc=32
 HPET_EMULATE_RTC i386=y x86_64=y
@@ -270,12 +270,12 @@
 X86_LOCAL_APIC i386=y x86_64=y
 X86_IO_APIC i386=y x86_64=y
 X86_MCE i386=y x86_64=y
-X86_MCE_NONFATAL i386=y
-X86_MCE_P4THERMAL i386=y
+X86_MCE_NONFATAL i386=
+X86_MCE_P4THERMAL i386=
 X86_MCE_INTEL i386=y x86_64=y
 X86_MCE_AMD i386=y x86_64=y
 X86_MCE_INJECT i386=n x86_64=n
-X86_OLD_MCE i386=n
+X86_OLD_MCE i386=
 X86_ANCIENT_MCE i386=n
 VM86 i386=y x86_64=
 TOSHIBA i386=m
@@ -287,7 +287,7 @@
 MICROCODE_OLD_INTERFACE i386=y x86_64=y
 X86_MSR i386=m x86_64=m
 X86_CPUID i386=m x86_64=m
-X86_CPU_DEBUG all=m x86_64=
+X86_CPU_DEBUG all=m x86_64= i386=
 NOHIGHMEM i386=n
 HIGHMEM4G i386=y
 HIGHMEM64G i386=n
@@ -305,7 +305,7 @@
 ARCH_SELECT_MEMORY_MODEL i386=y x86_64=y
 SELECT_MEMORY_MODEL all=y
 FLATMEM_MANUAL i386=y ppc=y x86_64=n sparc64=n alpha=y sparc=y
-DISCONTIGMEM_MANUAL i386=n ppc=n x86_64=n sparc64=y alpha=n sparc=n
+DISCONTIGMEM_MANUAL i386= ppc=n x86_64=n sparc64=y alpha=n sparc=n
 SPARSEMEM_MANUAL all=n x86_64=y
 X86_RESERVE_LOW_64K i386=y x86_64=y
 DISCONTIGMEM all=y ppc= i386= sparc= x86_64=
@@ -313,11 +313,11 @@
 FLAT_NODE_MEM_MAP all=y x86_64=
 NEED_MULTIPLE_NODES all=y ppc= i386= sparc=
 SPARSEMEM_STATIC all=n i386=y x86_64=
-SPARSEMEM_VMEMMAP_ENABLE i386=n ppc=n x86_64=y sparc64=y alpha=n sparc=n
+SPARSEMEM_VMEMMAP_ENABLE i386= ppc=n x86_64=y sparc64=y alpha=n sparc=n
 SPLIT_PTLOCK_CPUS all=4
-MIGRATION all=y
-RESOURCES_64BIT ppc=y x86_64= sparc64=y i386=y alpha=y sparc=n
-UNEVICTABLE_LRU all=y x86_64=
+MIGRATION all=y i386=
+RESOURCES_64BIT ppc=y x86_64= sparc64=y i386= alpha=y sparc=n
+UNEVICTABLE_LRU all=y x86_64= i386=
 FORCE_MAX_ZONEORDER ppc=11
 ZONE_DMA_FLAG all=1
 BOUNCE all=y
@@ -328,7 +328,7 @@
 MATH_EMULATION i386=n
 MTRR i386=y x86_64=y
 EFI i386=y x86_64=y
-IRQBALANCE i386=n
+IRQBALANCE i386=
 BOOT_IOREMAP i386=
 SECCOMP i386=y x86_64=y ppc=y
 CC_STACKPROTECTOR all=y
@@ -340,7 +340,7 @@
 KEXEC i386=y x86_64=y ppc=y
 CRASH_DUMP i386=n x86_64=n ppc=n
 KEXEC_JUMP i386=n x86_64=n ppc=n
-PHYSICAL_START i386=0x100000 x86_64=0x1000000
+PHYSICAL_START i386=0x1000000 x86_64=0x1000000
 RELOCATABLE i386=n x86_64=n
 PHYSICAL_ALIGN i386=0x100000 x86_64=0x1000000
 HOTPLUG_CPU i386=y x86_64=y ppc=y
@@ -348,9 +348,9 @@
 ARCH_ENABLE_MEMORY_HOTPLUG all=y sparc=
 HAVE_ARCH_EARLY_PFN_TO_NID x86_64=y
 OUT_OF_LINE_PFN_TO_PAGE x86_64=
-PARAVIRT_DEBUG all=n
+PARAVIRT_DEBUG all=n i386=
 MEMTEST all=n
-AMD_IOMMU all=n
+AMD_IOMMU all=n i386=
 MAXSMP i386= x86_64=n
 MTRR_SANITIZER all=n
 
@@ -378,21 +378,21 @@
 ACPI_BATTERY i386=m x86_64=m
 ACPI_BUTTON i386=m x86_64=m
 ACPI_FAN i386=m x86_64=m
-ACPI_BAY i386=m x86_64=
+ACPI_BAY i386= x86_64=
 ACPI_PROCESSOR i386=m x86_64=m
 ACPI_PROCESSOR_AGGREGATOR i386=m x86_64=m
 ACPI_HOTPLUG_CPU x86_64=y i386=y
 ACPI_THERMAL i386=m x86_64=m
 ACPI_NUMA x86_64=y
-ACPI_ASUS i386=m x86_64=m
-ACPI_TOSHIBA i386=m x86_64=m
+ACPI_ASUS i386= x86_64=m
+ACPI_TOSHIBA i386= x86_64=m
 ACPI_CUSTOM_DSDT i386=n x86_64=n
 ACPI_BLACKLIST_YEAR i386=0 x86_64=0
 ACPI_DEBUG i386=n x86_64=n
-ACPI_EC i386=y x86_64=
-ACPI_POWER i386=y x86_64=
+ACPI_EC i386= x86_64=
+ACPI_POWER i386= x86_64=
 ACPI_POWER_METER i386=m x86_64=m
-ACPI_SYSTEM i386=y x86_64=
+ACPI_SYSTEM i386= x86_64=
 X86_PM_TIMER i386=y x86_64=y
 ACPI_CONTAINER i386=m x86_64=m
 ACPI_SBS i386=m x86_64=m
@@ -403,7 +403,7 @@
 APM_CPU_IDLE i386=y
 APM_DISPLAY_BLANK i386=n
 APM_ALLOW_INTS i386=n
-APM_REAL_MODE_POWER_OFF i386=y
+APM_REAL_MODE_POWER_OFF i386=
 
 #
 # CPU Frequency scaling
@@ -431,7 +431,7 @@
 X86_POWERNOW_K7 i386=m
 X86_POWERNOW_K7_ACPI i386=y
 X86_POWERNOW_K8 i386=m x86_64=m
-X86_POWERNOW_K8_ACPI i386=y x86_64=
+X86_POWERNOW_K8_ACPI i386= x86_64=
 X86_GX_SUSPMOD i386=m
 X86_SPEEDSTEP_CENTRINO i386=m x86_64=m
 X86_SPEEDSTEP_CENTRINO_TABLE i386=y
@@ -446,10 +446,10 @@
 #
 # shared options
 #
-X86_ACPI_CPUFREQ_PROC_INTF i386=y x86_64=
+X86_ACPI_CPUFREQ_PROC_INTF i386= x86_64=
 X86_SPEEDSTEP_LIB i386=m x86_64=n
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
-CPU_IDLE x86_64=y i386=n
+CPU_IDLE x86_64=y i386=y
 
 #
 # Bus options (PCI etc.)
@@ -474,7 +474,7 @@
 VERBOSE_MCHECK alpha=n
 ARCH_SUPPORTS_MSI ppc=y x86_64=y i386=y sparc64=y alpha=n sparc=n
 PCI_MSI all=y sparc=
-PCI_LEGACY all=y sparc= x86_64=
+PCI_LEGACY all=y sparc= x86_64= i386=
 PCI_DEBUG all=n sparc=
 PCI_STUB all=m
 HT_IRQ all=y ppc= sparc=
@@ -492,10 +492,10 @@
 OLPC all=y x86_64=
 K8_NB x86_64=y i386=y
 PCCARD all=m sparc=
-PCMCIA_DEBUG all=n sparc= x86_64=
+PCMCIA_DEBUG all=n sparc= x86_64= i386=
 PCMCIA all=m sparc=
 PCMCIA_LOAD_CIS all=y sparc=
-PCMCIA_IOCTL all=n sparc= x86_64=
+PCMCIA_IOCTL all=n sparc= x86_64= i386=
 CARDBUS all=y sparc=
 
 #
@@ -512,7 +512,7 @@
 I82365 all=m sparc= x86_64=
 TCIC all=m sparc= x86_64=
 PCMCIA_PROBE all=y sparc= x86_64=
-PCCARD_NONSTATIC all=m sparc=
+PCCARD_NONSTATIC all=m sparc= i386=y
 SRM_ENV alpha=m
 HOTPLUG_PCI all=m alpha= sparc=
 HOTPLUG_PCI_FAKE all=m alpha= sparc=
@@ -550,7 +550,7 @@
 # Networking options
 #
 PACKET all=y
-PACKET_MMAP all=y x86_64=
+PACKET_MMAP all=y x86_64= i386=
 UNIX all=y
 XFRM all=y
 XFRM_USER all=m
@@ -603,10 +603,10 @@
 TCP_CONG_YEAH all=m
 TCP_CONG_ILLINOIS all=m
 DEFAULT_BIC all=y
-DEFAULT_CUBIC all=n
-DEFAULT_HTCP all=n
-DEFAULT_VEGAS all=n
-DEFAULT_WESTWOOD all=n
+DEFAULT_CUBIC all=n i386=
+DEFAULT_HTCP all=n i386=
+DEFAULT_VEGAS all=n i386=
+DEFAULT_WESTWOOD all=n i386=
 DEFAULT_RENO all=n
 DEFAULT_TCP_CONG all="bic"
 TCP_MD5SIG all=n
@@ -677,7 +677,7 @@
 NETFILTER_NETLINK_LOG all=m
 NF_CONNTRACK_ENABLED all=m i386= x86_64= ppc=
 NF_CONNTRACK all=m
-NF_CT_ACCT all=y
+NF_CT_ACCT all=y i386=
 NF_CONNTRACK_MARK all=y
 NF_CONNTRACK_SECMARK all=n
 NF_CONNTRACK_EVENTS all=n
@@ -728,7 +728,7 @@
 NETFILTER_XT_MATCH_QUOTA all=m
 NETFILTER_XT_MATCH_REALM all=m
 NETFILTER_XT_MATCH_RECENT all=m
-NETFILTER_XT_MATCH_RECENT_PROC_COMPAT all=n
+NETFILTER_XT_MATCH_RECENT_PROC_COMPAT all=n i386=
 NETFILTER_XT_MATCH_SCTP all=m
 NETFILTER_XT_MATCH_SOCKET all=m
 NETFILTER_XT_MATCH_STATE all=m
@@ -750,7 +750,7 @@
 IP_NF_IPTABLES all=m
 IP_NF_MATCH_IPRANGE all=m i386= x86_64= ppc=
 IP_NF_MATCH_TOS all=m i386= x86_64= ppc=
-IP_NF_MATCH_RECENT all=m x86_64=
+IP_NF_MATCH_RECENT all=m x86_64= i386=
 IP_NF_MATCH_ECN all=m
 IP_NF_MATCH_AH all=n
 IP_NF_MATCH_TTL all=m
@@ -840,12 +840,12 @@
 BRIDGE_EBT_IP6 all=m
 IP_DCCP all=m
 INET_DCCP_DIAG all=m
-IP_DCCP_ACKVEC all=y x86_64=
+IP_DCCP_ACKVEC all=y x86_64= i386=
 
 #
 # DCCP CCIDs Configuration (EXPERIMENTAL)
 #
-IP_DCCP_CCID2 all=m x86_64=
+IP_DCCP_CCID2 all=m x86_64= i386=
 IP_DCCP_CCID2_DEBUG all=n
 IP_DCCP_CCID3 all=y
 IP_DCCP_TFRC_LIB all=y
@@ -1064,8 +1064,8 @@
 #
 # Bluetooth device drivers
 #
-BT_HCIUSB all=m sparc= x86_64=
-BT_HCIUSB_SCO all=y sparc= x86_64=
+BT_HCIUSB all=m sparc= x86_64= i386=
+BT_HCIUSB_SCO all=y sparc= x86_64= i386=
 BT_HCIBTUSB all=m sparc=
 BT_HCIBTSDIO all=m
 BT_HCIUART all=m
@@ -1095,9 +1095,9 @@
 CFG80211_REG_DEBUG all=n
 CFG80211_DEBUGFS all=n
 CFG80211_DEVELOPER_WARNINGS all=n
-NL80211 all=y x86_64=
+NL80211 all=y x86_64= i386=
 NL80211_TESTMODE all=n
-WIRELESS_OLD_REGULATORY all=y x86_64=
+WIRELESS_OLD_REGULATORY all=y x86_64= i386=
 WIRELESS_EXT all=y
 WIRELESS_EXT_SYSFS all=y
 LIB80211 all=m
@@ -1107,18 +1107,18 @@
 LIB80211_DEBUG all=n
 
 MAC80211 all=m
-MAC80211_DEFAULT_PS all=y x86_64=
+MAC80211_DEFAULT_PS all=y x86_64= i386=
 MAC80211_RCSIMPLE all=y i386= x86_64= ppc=
 MAC80211_LEDS all=y
 MAC80211_DEBUGFS all=n sparc=
-MAC80211_DEBUG all=n x86_64=
+MAC80211_DEBUG all=n x86_64= i386=
 MAC80211_DEBUG_MENU all=n
-MAC80211_RC_MINSTREL all=n x86_64=y
-IEEE80211 all=m x86_64=
-IEEE80211_DEBUG all=n x86_64=
-IEEE80211_CRYPT_WEP all=m x86_64=
-IEEE80211_CRYPT_CCMP all=m x86_64=
-IEEE80211_CRYPT_TKIP all=m x86_64=
+MAC80211_RC_MINSTREL all=n x86_64=y i386=y
+IEEE80211 all=m x86_64= i386=
+IEEE80211_DEBUG all=n x86_64= i386=
+IEEE80211_CRYPT_WEP all=m x86_64= i386=
+IEEE80211_CRYPT_CCMP all=m x86_64= i386=
+IEEE80211_CRYPT_TKIP all=m x86_64= i386=
 IEEE802154 all=m
 IEEE802154_DRIVERS all=m
 IEEE802154_FAKEHARD all=m
@@ -1144,15 +1144,15 @@
 REGULATOR_BQ24022 all=m
 REGULATOR_MAX1586 all=m
 REGULATOR_TWL4030 all=y
-REGULATOR_WM831X all=m x86_64=
-REGULATOR_WM8350 all=m x86_64=
+REGULATOR_WM831X all=m x86_64= i386=
+REGULATOR_WM8350 all=m x86_64= i386=
 REGULATOR_WM8400 all=m
 REGULATOR_DA903X all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_LP3971 all=m
 REGULATOR_PCAP all=m
 REGULATOR_MC13783 all=m
-REGULATOR_AB3100 all=m x86_64=
+REGULATOR_AB3100 all=m x86_64= i386=
 REGULATOR_TPS65023 all=m
 REGULATOR_TPS6507X all=m
 
@@ -1164,7 +1164,7 @@
 PREVENT_FIRMWARE_BUILD all=y
 FIRMWARE_IN_KERNEL all=y
 EXTRA_FIRMWARE all=""
-FW_LOADER all=m x86_64=y
+FW_LOADER all=m x86_64=y i386=y
 DEBUG_DRIVER all=n
 DEBUG_DEVRES all=n
 SYS_HYPERVISOR all=n
@@ -1232,9 +1232,9 @@
 MTD_COMPLEX_MAPPINGS ppc=y x86_64=y sparc64=y i386=y alpha=y sparc=n
 MTD_PHYSMAP all=m sparc=n
 MTD_PHYSMAP_COMPAT all=n
-MTD_PHYSMAP_START all=0x8000000 sparc= x86_64=
-MTD_PHYSMAP_LEN all=0x4000000 sparc= x86_64=
-MTD_PHYSMAP_BANKWIDTH all=2 sparc= x86_64=
+MTD_PHYSMAP_START all=0x8000000 sparc= x86_64= i386=
+MTD_PHYSMAP_LEN all=0x4000000 sparc= x86_64= i386=
+MTD_PHYSMAP_BANKWIDTH all=2 sparc= x86_64= i386=
 MTD_LPDDR all=m
 MTD_PNC2000 all=m ppc= sparc= i386= x86_64=
 MTD_SC520CDP all=m ppc= sparc=
@@ -1248,8 +1248,8 @@
 MTD_CK804XROM all=m ppc= sparc=
 MTD_SCB2_FLASH all=m ppc= sparc=
 MTD_NETtel all=m ppc= sparc=
-MTD_DILNETPC all=m ppc= sparc= x86_64=
-MTD_DILNETPC_BOOTSIZE all=0x80000 ppc= sparc= x86_64=
+MTD_DILNETPC all=m ppc= sparc= x86_64= i386=
+MTD_DILNETPC_BOOTSIZE all=0x80000 ppc= sparc= x86_64= i386=
 MTD_L440GX all=m ppc= sparc=
 MTD_PCI all=m sparc=
 MTD_INTEL_VR_NOR all=n sparc=
@@ -1307,7 +1307,7 @@
 MTD_UBI all=m
 MTD_UBI_WL_THRESHOLD all=4096
 MTD_UBI_BEB_RESERVE all=1
-MTD_UBI_GLUEBI all=y x86_64=m
+MTD_UBI_GLUEBI all=y x86_64=m i386=m
 
 #
 # UBI debugging options
@@ -1324,7 +1324,7 @@
 PARPORT_1284 all=y
 PARPORT_NOT_PC all=y
 PNP all=y sparc=
-PNP_DEBUG all=n sparc= x86_64=
+PNP_DEBUG all=n sparc= x86_64= i386=
 PNP_DEBUG_MESSAGES all=y
 
 #
@@ -1339,7 +1339,7 @@
 BLK_DEV_XD all=m x86_64= sparc=
 BLK_DEV_INTEGRITY all=n
 PARIDE all=m sparc=
-XEN all=n
+XEN all=n i386=
 
 #
 # Parallel IDE high-level drivers
@@ -1396,21 +1396,21 @@
 SGI_IOC4 all=m sparc=
 TIFM_CORE all=m sparc=
 TIFM_7XX1 all=m sparc=
-ASUS_LAPTOP all=m ppc= sparc=
-FUJITSU_LAPTOP all=n ppc= sparc=
-MSI_LAPTOP all=m ppc= sparc=
-PANASONIC_LAPTOP all=m ppc= sparc=
-SONY_LAPTOP all=m ppc= sparc=
-SONYPI_COMPAT all=n ppc= sparc=
-THINKPAD_ACPI all=m ppc= sparc=
-THINKPAD_ACPI_DEBUGFACILITIES all=n ppc= sparc=
-THINKPAD_ACPI_DEBUG all=n ppc= sparc=
-THINKPAD_ACPI_UNSAFE_LEDS all=n
-THINKPAD_ACPI_BAY all=y ppc= sparc= x86_64=
-TOPSTAR_LAPTOP all=m
+ASUS_LAPTOP all=m ppc= sparc= i386=
+FUJITSU_LAPTOP all=n ppc= sparc= i386=
+MSI_LAPTOP all=m ppc= sparc= i386=
+PANASONIC_LAPTOP all=m ppc= sparc= i386=
+SONY_LAPTOP all=m ppc= sparc= i386=
+SONYPI_COMPAT all=n ppc= sparc= i386=
+THINKPAD_ACPI all=m ppc= sparc= i386=
+THINKPAD_ACPI_DEBUGFACILITIES all=n ppc= sparc= i386=
+THINKPAD_ACPI_DEBUG all=n ppc= sparc= i386=
+THINKPAD_ACPI_UNSAFE_LEDS all=n i386=
+THINKPAD_ACPI_BAY all=y ppc= sparc= x86_64= i386=
+TOPSTAR_LAPTOP all=m i386=
 IDE i386=m x86_64=m ppc=y alpha=m sparc=n
 IDE_MAX_HWIFS alpha=4
-BLK_DEV_IDE i386=m x86_64= ppc=y alpha=m
+BLK_DEV_IDE i386= x86_64= ppc=y alpha=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
@@ -1419,14 +1419,14 @@
 IDE_GD all=m
 IDE_GD_ATA all=y
 IDE_GD_ATAPI all=n
-BLK_DEV_IDEDISK all=m sparc= x86_64=
-IDEDISK_MULTI_MODE all=y sparc= x86_64=
+BLK_DEV_IDEDISK all=m sparc= x86_64= i386=
+IDEDISK_MULTI_MODE all=y sparc= x86_64= i386=
 BLK_DEV_IDECS all=m sparc=
 BLK_DEV_DELKIN all=m sparc=
 BLK_DEV_IDECD all=m sparc=
 BLK_DEV_IDETAPE all=m sparc=
-BLK_DEV_IDEFLOPPY all=m sparc= x86_64=
-BLK_DEV_IDESCSI all=m sparc= x86_64=
+BLK_DEV_IDEFLOPPY all=m sparc= x86_64= i386=
+BLK_DEV_IDESCSI all=m sparc= x86_64= i386=
 BLK_DEV_IDEACPI all=n ppc= sparc=
 IDE_TASK_IOCTL all=n sparc=
 IDE_PROC_FS all=y sparc=
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-vanilla/kernel-vanilla-multiarch.conf?r1=1.136&r2=1.137&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-vanilla/kernel-vanilla.spec?r1=1.227&r2=1.228&f=u



More information about the pld-cvs-commit mailing list