From 85fafa691005bade399dd166952996d2d6e40f95 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Mon, 9 Jan 2006 17:16:22 +0000
Subject: [PATCH] x86-2.6 compile fixes for snapshot build

SVN-Revision: 2867
---
 openwrt/target/linux/linux-2.6/config/x86  | 33 ++++++++++++++++------
 openwrt/target/linux/package/Makefile      |  2 ++
 openwrt/target/linux/package/alsa/Makefile |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/openwrt/target/linux/linux-2.6/config/x86 b/openwrt/target/linux/linux-2.6/config/x86
index 872232dff8..87cc55d7ab 100644
--- a/openwrt/target/linux/linux-2.6/config/x86
+++ b/openwrt/target/linux/linux-2.6/config/x86
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc5
-# Mon Dec 19 01:17:56 2005
+# Linux kernel version: 2.6.15
+# Mon Jan  9 17:20:51 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -35,6 +35,7 @@ CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y
 # CONFIG_KALLSYMS is not set
 CONFIG_PRINTK=y
@@ -42,7 +43,6 @@ CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SHMEM=y
 CONFIG_CC_ALIGN_FUNCTIONS=0
 CONFIG_CC_ALIGN_LABELS=0
@@ -488,7 +488,6 @@ CONFIG_IP_DCCP_TFRC_LIB=m
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_CLIP_NO_ICMP=y
@@ -522,6 +521,7 @@ CONFIG_NET_SCH_CLK_JIFFIES=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
+# CONFIG_NET_SCH_ATM is not set
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
@@ -932,7 +932,7 @@ CONFIG_SCSI_QLA2XXX=m
 #
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
+CONFIG_BONDING=m
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
 # CONFIG_NET_SB1000 is not set
@@ -1105,6 +1105,23 @@ CONFIG_NET_WIRELESS=y
 # Wan interfaces
 #
 # CONFIG_WAN is not set
+
+#
+# ATM drivers
+#
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_FORE200E_MAYBE is not set
+# CONFIG_ATM_HE is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PPP=m
@@ -1116,6 +1133,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOATM is not set
 # CONFIG_SLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
@@ -1700,10 +1718,7 @@ CONFIG_USB_SERIAL_PL2303=m
 #
 # USB DSL modem support
 #
-CONFIG_USB_ATM=m
-# CONFIG_USB_SPEEDTOUCH is not set
-# CONFIG_USB_CXACRU is not set
-# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_ATM is not set
 
 #
 # USB Gadget Support
diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index 5fc604d5a9..3d28ca77e3 100644
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/target/linux/package/Makefile
@@ -2,8 +2,10 @@
 include $(TOPDIR)/rules.mk
 
 ifneq ($(BOARD),ar7)
+ifneq ($(BOARD)-$(KERNEL),x86-2.6)
 package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
 endif
+endif
 package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
 package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
 package-$(BR2_PACKAGE_KMOD_BCM43XX_DSCAPE) += bcm43xx-dscape
diff --git a/openwrt/target/linux/package/alsa/Makefile b/openwrt/target/linux/package/alsa/Makefile
index eea05a0748..02baa44b34 100644
--- a/openwrt/target/linux/package/alsa/Makefile
+++ b/openwrt/target/linux/package/alsa/Makefile
@@ -21,7 +21,7 @@ endif
 include $(TOPDIR)/package/rules.mk
 
 ifeq ($(LINUX_KARCH),i386)
-KERNEL_C_INCS:=
+KERNEL_C_INCS:= -I$(KERNEL_DIR)/include/asm-i386/mach-generic
 KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time
 endif
 ifeq ($(LINUX_KARCH),mips)