SOURCES (LINUX_2_6): kernel-imq.patch - universal Makefiles

[zbyniu]

Author: zbyniu                       Date: Tue Sep 23 11:59:19 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- universal Makefiles

---- Files affected:
SOURCES:
   kernel-imq.patch (1.1.2.1.2.8 -> 1.1.2.1.2.9) 

---- Diffs:

================================================================
Index: SOURCES/kernel-imq.patch
diff -u SOURCES/kernel-imq.patch:1.1.2.1.2.8 SOURCES/kernel-imq.patch:1.1.2.1.2.9
--- SOURCES/kernel-imq.patch:1.1.2.1.2.8	Mon Sep  8 14:21:56 2008
+++ SOURCES/kernel-imq.patch	Tue Sep 23 13:59:13 2008
@@ -609,14 +609,8 @@
  	select CRC32
 --- linux-2.6.25.7/drivers/net/Makefile	2008-06-16 23:24:36.000000000 +0300
 +++ linux-2.6.25.7.imq/drivers/net/Makefile	2008-06-17 14:56:58.000000000 +0300
-@@ -143,6 +143,7 @@
- obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
- 
- obj-$(CONFIG_DUMMY) += dummy.o
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_IMQ) += imq.o
- obj-$(CONFIG_IFB) += ifb.o
- obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_DE600) += de600.o
 --- linux-2.6.25.7/include/linux/imq.h	1970-01-01 02:00:00.000000000 +0200
 +++ linux-2.6.25.7.imq/include/linux/imq.h	2008-06-17 14:56:58.000000000 +0300
 @@ -0,0 +1,9 @@
@@ -794,14 +788,8 @@
  	depends on IP_NF_FILTER
 --- linux-2.6.25.7/net/ipv4/netfilter/Makefile	2008-06-16 23:24:36.000000000 +0300
 +++ linux-2.6.25.7.imq/net/ipv4/netfilter/Makefile	2008-06-17 14:56:58.000000000 +0300
-@@ -51,6 +51,7 @@
- obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
- obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
- obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
- obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
- obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
- obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
 --- linux-2.6.25.7/net/ipv6/netfilter/ip6t_IMQ.c	1970-01-01 02:00:00.000000000 +0200
 +++ linux-2.6.25.7.imq/net/ipv6/netfilter/ip6t_IMQ.c	2008-06-17 14:56:58.000000000 +0300
 @@ -0,0 +1,69 @@
@@ -894,14 +882,8 @@
  	depends on IP6_NF_MANGLE
 --- linux-2.6.25.7/net/ipv6/netfilter/Makefile	2008-06-16 23:24:36.000000000 +0300
 +++ linux-2.6.25.7.imq/net/ipv6/netfilter/Makefile	2008-06-17 14:56:58.000000000 +0300
-@@ -6,6 +6,7 @@
- obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
- obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
- obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
+@@ -0,0 +0,1 @@
 +obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
- obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
- obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
- 
 --- linux-2.6.25.7/net/sched/sch_generic.c	2008-06-16 23:24:36.000000000 +0300
 +++ linux-2.6.25.7.imq/net/sched/sch_generic.c	2008-06-17 14:56:58.000000000 +0300
 @@ -203,6 +203,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-imq.patch?r1=1.1.2.1.2.8&r2=1.1.2.1.2.9&f=u