aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.4/patches/224-atm_hotplug.patch
diff options
context:
space:
mode:
authorAndy Boyett <agb@openwrt.org>2009-05-15 10:36:04 +0000
committerAndy Boyett <agb@openwrt.org>2009-05-15 10:36:04 +0000
commit8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0 (patch)
tree9b091ee20cd4b6f105d47c24c442c8c98a429465 /target/linux/generic-2.4/patches/224-atm_hotplug.patch
parentfadda2c9fa8120b257f258037345012b73e26e28 (diff)
downloadupstream-8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0.tar.gz
upstream-8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0.tar.bz2
upstream-8d1f64af73ac68bd1d4f017cef7d3dbeaa5fc6e0.zip
[kernel] generic-2.4: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15860 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.4/patches/224-atm_hotplug.patch')
-rw-r--r--target/linux/generic-2.4/patches/224-atm_hotplug.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/generic-2.4/patches/224-atm_hotplug.patch b/target/linux/generic-2.4/patches/224-atm_hotplug.patch
index 64dd3e8a3b..b1238ed015 100644
--- a/target/linux/generic-2.4/patches/224-atm_hotplug.patch
+++ b/target/linux/generic-2.4/patches/224-atm_hotplug.patch
@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/atmdev.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/atmdev.h
-+++ linux-2.4.35.4/include/linux/atmdev.h
+--- a/include/linux/atmdev.h
++++ b/include/linux/atmdev.h
@@ -400,6 +400,7 @@ extern rwlock_t vcc_sklist_lock;
struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
@@ -10,10 +8,8 @@ Index: linux-2.4.35.4/include/linux/atmdev.h
void atm_dev_deregister(struct atm_dev *dev);
void shutdown_atm_dev(struct atm_dev *dev);
void vcc_insert_socket(struct sock *sk);
-Index: linux-2.4.35.4/net/atm/resources.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/resources.c
-+++ linux-2.4.35.4/net/atm/resources.c
+--- a/net/atm/resources.c
++++ b/net/atm/resources.c
@@ -10,6 +10,7 @@
#include <linux/sonet.h>
#include <linux/kernel.h> /* for barrier */