From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 13 Nov 2008 14:28:09 +0000 (+0000)
Subject: update 2.6.27 specific patches, and sync kernel config
X-Git-Tag: reboot~25282
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f76bec1452e552dfbd08193a22874b887e13b4c2;p=openwrt%2Fstaging%2Fjogo.git

update 2.6.27 specific patches, and sync kernel config

SVN-Revision: 13196
---

diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27
index 6591f64984..ffb942efcc 100644
--- a/target/linux/ar71xx/config-2.6.27
+++ b/target/linux/ar71xx/config-2.6.27
@@ -212,9 +212,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SMSC_PHY is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_SPI is not set
-CONFIG_SND_USB=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
diff --git a/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch
index 530b2f42ca..78b9b33dba 100644
--- a/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -77,6 +77,11 @@ config MVSWITCH_PHY
+@@ -83,6 +83,11 @@ config MVSWITCH_PHY
  	---help---
  	  Currently supports the Marvell 88E6060 switch.
  
@@ -14,7 +14,7 @@
  	depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+@@ -16,6 +16,7 @@ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
  obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o