aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-13 14:28:09 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-13 14:28:09 +0000
commit8c8dd848fb70de62cb57b422f4bd527a18cd3f3e (patch)
treeb9dc0d53c4a80ddc4b973be750c7d03e110abf7c /target
parent2f7fea3003153748f3b601e879ed14c7fb9fcc14 (diff)
downloadupstream-8c8dd848fb70de62cb57b422f4bd527a18cd3f3e.tar.gz
upstream-8c8dd848fb70de62cb57b422f4bd527a18cd3f3e.tar.bz2
upstream-8c8dd848fb70de62cb57b422f4bd527a18cd3f3e.zip
[ar71xx] update 2.6.27 specific patches, and sync kernel config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13196 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/config-2.6.273
-rw-r--r--target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch4
2 files changed, 2 insertions, 5 deletions
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