summaryrefslogtreecommitdiffstats
path: root/target/linux/amazon/patches
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-06-20 18:44:24 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-06-20 18:44:24 +0000
commit6e42b25c88119d50df668e12f0e62579c622d0ca (patch)
treeac4463b57e67b104f835b41abb3463d622ce825c /target/linux/amazon/patches
parent5de80e6e286d62cde0e7a264e41741aa049b387f (diff)
downloadmaster-31e0f0ae-6e42b25c88119d50df668e12f0e62579c622d0ca.tar.gz
master-31e0f0ae-6e42b25c88119d50df668e12f0e62579c622d0ca.tar.bz2
master-31e0f0ae-6e42b25c88119d50df668e12f0e62579c622d0ca.zip
Add ADM6996 switch driver
This fixes #5314 Thanks to Michael Richter SVN-Revision: 16523
Diffstat (limited to 'target/linux/amazon/patches')
-rw-r--r--target/linux/amazon/patches/110-char_drivers.patch10
-rw-r--r--target/linux/amazon/patches/140-net_drivers.patch3
2 files changed, 2 insertions, 11 deletions
diff --git a/target/linux/amazon/patches/110-char_drivers.patch b/target/linux/amazon/patches/110-char_drivers.patch
deleted file mode 100644
index f56f8969f5..0000000000
--- a/target/linux/amazon/patches/110-char_drivers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -104,6 +104,7 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/
-
- obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
- obj-$(CONFIG_TCG_TPM) += tpm/
-+obj-$(CONFIG_AMAZONE_WDT) += amazone_wdt.o
-
- # Files generated that shall be removed upon make clean
- clean-files := consolemap_deftbl.c defkeymap.c
diff --git a/target/linux/amazon/patches/140-net_drivers.patch b/target/linux/amazon/patches/140-net_drivers.patch
index 4732250e12..2b5c1b6324 100644
--- a/target/linux/amazon/patches/140-net_drivers.patch
+++ b/target/linux/amazon/patches/140-net_drivers.patch
@@ -1,8 +1,9 @@
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
-@@ -219,3 +219,5 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
+@@ -219,3 +219,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_FS_ENET) += fs_enet/
obj-$(CONFIG_NETXEN_NIC) += netxen/
+
+obj-$(CONFIG_AMAZON_NET_SW) += amazon_sw.o
++obj-$(CONFIG_ADM6996_SUPPORT) += admmod.o