aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorMatteo Croce <matteo@openwrt.org>2007-12-30 15:24:15 +0000
committerMatteo Croce <matteo@openwrt.org>2007-12-30 15:24:15 +0000
commit84527fa874a219fd7437f216d2cb9d7449c56c16 (patch)
treea8348bdd1333e604f2c645843766f725dc7c83c0 /target/linux/ar7
parentb732e03c7fc0ab370fc41fb42bb33644574457b1 (diff)
downloadupstream-84527fa874a219fd7437f216d2cb9d7449c56c16.tar.gz
upstream-84527fa874a219fd7437f216d2cb9d7449c56c16.tar.bz2
upstream-84527fa874a219fd7437f216d2cb9d7449c56c16.zip
AR7 2.6.24, removed duplicate patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10053 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/patches-2.6.24/140-watchdog.patch29
-rw-r--r--target/linux/ar7/patches-2.6.24/200-ethernet_driver.patch32
2 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/ar7/patches-2.6.24/140-watchdog.patch b/target/linux/ar7/patches-2.6.24/140-watchdog.patch
deleted file mode 100644
index 6bd9e458d0..0000000000
--- a/target/linux/ar7/patches-2.6.24/140-watchdog.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: linux-2.6.23-rc6/drivers/char/watchdog/Kconfig
-===================================================================
---- linux-2.6.23-rc6.orig/drivers/char/watchdog/Kconfig 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/char/watchdog/Kconfig 2007-09-21 16:24:12.000000000 +0800
-@@ -583,6 +583,12 @@
-
- # MIPS Architecture
-
-+config AR7_WDT
-+ tristate "TI AR7 Watchdog Timer"
-+ depends on WATCHDOG && AR7
-+ help
-+ Hardware driver for the TI AR7 Watchdog Timer.
-+
- config INDYDOG
- tristate "Indy/I2 Hardware Watchdog"
- depends on SGI_IP22
-Index: linux-2.6.23-rc6/drivers/char/watchdog/Makefile
-===================================================================
---- linux-2.6.23-rc6.orig/drivers/char/watchdog/Makefile 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/char/watchdog/Makefile 2007-09-21 16:24:12.000000000 +0800
-@@ -87,6 +87,7 @@
- # M68KNOMMU Architecture
-
- # MIPS Architecture
-+obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_INDYDOG) += indydog.o
- obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
- obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
diff --git a/target/linux/ar7/patches-2.6.24/200-ethernet_driver.patch b/target/linux/ar7/patches-2.6.24/200-ethernet_driver.patch
deleted file mode 100644
index 08f26576be..0000000000
--- a/target/linux/ar7/patches-2.6.24/200-ethernet_driver.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: linux-2.6.23/drivers/net/Kconfig
-===================================================================
---- linux-2.6.23.orig/drivers/net/Kconfig 2007-10-10 13:52:54.000000000 +0800
-+++ linux-2.6.23/drivers/net/Kconfig 2007-10-10 13:53:54.000000000 +0800
-@@ -1965,6 +1965,15 @@
- To compile this driver as a module, choose M here: the module
- will be called sc92031. This is recommended.
-
-+config CPMAC
-+ tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
-+ depends on NET_ETHERNET && EXPERIMENTAL && AR7
-+ select PHYLIB
-+ select FIXED_PHY
-+ select FIXED_MII_100_FDX
-+ help
-+ TI AR7 CPMAC Ethernet support
-+
- config NET_POCKET
- bool "Pocket and portable adapters"
- depends on PARPORT
-Index: linux-2.6.23/drivers/net/Makefile
-===================================================================
---- linux-2.6.23.orig/drivers/net/Makefile 2007-10-10 13:52:54.000000000 +0800
-+++ linux-2.6.23/drivers/net/Makefile 2007-10-10 13:53:54.000000000 +0800
-@@ -156,6 +156,7 @@
- obj-$(CONFIG_8139TOO) += 8139too.o
- obj-$(CONFIG_ZNET) += znet.o
- obj-$(CONFIG_LAN_SAA9730) += saa9730.o
-+obj-$(CONFIG_CPMAC) += cpmac.o
- obj-$(CONFIG_DEPCA) += depca.o
- obj-$(CONFIG_EWRK3) += ewrk3.o
- obj-$(CONFIG_ATP) += atp.o