SOURCES: kernel-desktop-atmdd.patch - up to current linux-2.6-atmd...

[czarny]

Author: czarny                       Date: Fri Aug  3 00:27:31 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to current linux-2.6-atmdd at LINUX_2_6
- small fix to apply

---- Files affected:
SOURCES:
   kernel-desktop-atmdd.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-atmdd.patch
diff -u SOURCES/kernel-desktop-atmdd.patch:1.1 SOURCES/kernel-desktop-atmdd.patch:1.2
--- SOURCES/kernel-desktop-atmdd.patch:1.1	Mon Jun 19 14:01:18 2006
+++ SOURCES/kernel-desktop-atmdd.patch	Fri Aug  3 02:27:26 2007
@@ -1,36 +1,7 @@
-diff -urN linux-2.4.25/drivers/atm/Makefile linux-2.4.25-atmdd/drivers/atm/Makefile
---- linux-2.4.25/drivers/atm/Makefile	2004-02-23 15:18:29.000000000 +0100
-+++ linux-2.4.25-atmdd/drivers/atm/Makefile	2004-02-29 22:51:26.000000000 +0100
-@@ -31,6 +31,7 @@
- endif
- 
- obj-$(CONFIG_ATM_DUMMY)		+= adummy.o
-+obj-$(CONFIG_ATM_DD)		+= atmdd.o
- obj-$(CONFIG_ATM_TCP)		+= atmtcp.o
- obj-$(CONFIG_ATM_FIRESTREAM)	+= firestream.o
- obj-$(CONFIG_ATM_LANAI)		+= lanai.o
-diff -urN linux-2.4.25/drivers/atm/Kconfig linux-2.4.25-atmdd/drivers/atm/Kconfig
---- linux-2.4.25/drivers/atm/Kcnfig	2003-08-25 13:44:41.000000000 +0200
-+++ linux-2.4.25-atmdd/drivers/atm/Kconfig	2004-02-29 22:52:59.000000000 +0100
-@@ -4,6 +4,14 @@
- 
- menu "ATM drivers"
- 	depends on NETDEVICES && ATM
-+
-+config ATM_DD
-+	tristate "ATM loopback"
-+	depends on INET && ATM
-+	help
-+	  This is an example atm driver.  It does not require any actual ATM
-+	  hardware.  It supports AAL5 and AAL0.  Frames are merely looped back
-+	  to the sender on the same VC they were sent.
- 
- config ATM_TCP
- 	tristate "ATM over TCP"
-diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.c
---- linux-2.4.25/drivers/atm/atmdd.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.4.25-atmdd/drivers/atm/atmdd.c	2004-02-29 22:58:11.000000000 +0100
-@@ -0,0 +1,922 @@
+diff -urN linux-2.6.22/drivers/atm/atmdd.c linux-2.6.22.atmdd/drivers/atm/atmdd.c
+--- linux-2.6.22/drivers/atm/atmdd.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22.atmdd/drivers/atm/atmdd.c	2007-08-03 02:11:55.578398784 +0200
+@@ -0,0 +1,921 @@
 +/*
 +#######################################################################
 +#
@@ -64,7 +35,6 @@
 +/*############ Includes ###############################################*/
 +
 +#include <linux/module.h>
-+#include <linux/config.h>
 +#include <linux/kernel.h>
 +#include <linux/errno.h>
 +#include <linux/atm.h>
@@ -953,3 +923,59 @@
 +module_exit(myatmdd_exit);
 +
 +#endif /* MODULE */
+diff -urN linux-2.6.22/drivers/atm/Kconfig linux-2.6.22.atmdd/drivers/atm/Kconfig
+--- linux-2.6.22/drivers/atm/Kconfig	2007-07-09 01:32:17.000000000 +0200
++++ linux-2.6.22.atmdd/drivers/atm/Kconfig	2007-08-03 02:13:22.534007482 +0200
+@@ -9,6 +9,14 @@
+ 
+ if ATM_DRIVERS && NETDEVICES && ATM
+ 
++config ATM_DD
++	tristate "ATM loopback"
++	depends on INET && ATM
++	help
++	  This is an example atm driver.  It does not require any actual ATM
++	  hardware.  It supports AAL5 and AAL0.  Frames are merely looped back
++	  to the sender on the same VC they were sent.
++
+ config ATM_DUMMY
+ 	tristate "Dummy ATM driver"
+ 	help
+diff -urN linux-2.6.22/drivers/atm/Kconfig.rej linux-2.6.22.atmdd/drivers/atm/Kconfig.rej
+--- linux-2.6.22/drivers/atm/Kconfig.rej	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22.atmdd/drivers/atm/Kconfig.rej	2007-08-03 02:11:55.574398802 +0200
+@@ -0,0 +1,23 @@
++***************
++*** 4,9 ****
++  
++  menu "ATM drivers"
++  	depends on NETDEVICES && ATM
++  
++  config ATM_DUMMY
++  	tristate "Dummy ATM driver"
++--- 4,17 ----
++  
++  menu "ATM drivers"
++  	depends on NETDEVICES && ATM
+++ 
+++ config ATM_DD
+++ 	tristate "ATM loopback"
+++ 	depends on INET && ATM
+++ 	help
+++ 	  This is an example atm driver.  It does not require any actual ATM
+++ 	  hardware.  It supports AAL5 and AAL0.  Frames are merely looped back
+++ 	  to the sender on the same VC they were sent.
++  
++  config ATM_DUMMY
++  	tristate "Dummy ATM driver"
+diff -urN linux-2.6.22/drivers/atm/Makefile linux-2.6.22.atmdd/drivers/atm/Makefile
+--- linux-2.6.22/drivers/atm/Makefile	2007-07-09 01:32:17.000000000 +0200
++++ linux-2.6.22.atmdd/drivers/atm/Makefile	2007-08-03 02:11:55.550398910 +0200
+@@ -32,6 +32,7 @@
+ endif
+ 
+ obj-$(CONFIG_ATM_DUMMY)		+= adummy.o
++obj-$(CONFIG_ATM_DD)		+= atmdd.o
+ obj-$(CONFIG_ATM_TCP)		+= atmtcp.o
+ obj-$(CONFIG_ATM_FIRESTREAM)	+= firestream.o
+ obj-$(CONFIG_ATM_LANAI)		+= lanai.o
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-atmdd.patch?r1=1.1&r2=1.2&f=u