Debian: Update change log for 1.1.0~pre2.g2.ea763e0e-1 upload

[openvswitch] / datapath / linux-2.6 / Modules.mk

diff --git a/datapath/linux-2.6/Modules.mk b/datapath/linux-2.6/Modules.mk
index b41a8d27a4ed4b2118232c10f6a21413d501787a..1bc092e1b7920043623b62caf442172e89eaf360 100644 (file)
--- a/datapath/linux-2.6/Modules.mk
+++ b/datapath/linux-2.6/Modules.mk
@@ -4,11 +4,15 @@ openvswitch_sources += \
        linux-2.6/compat-2.6/genetlink-openvswitch.c \
        linux-2.6/compat-2.6/ip_output-openvswitch.c \
        linux-2.6/compat-2.6/kmemdup.c \
-       linux-2.6/compat-2.6/random32.c \
-       linux-2.6/compat-2.6/skbuff-openvswitch.c
+       linux-2.6/compat-2.6/netdevice.c \
+       linux-2.6/compat-2.6/skbuff-openvswitch.c \
+       linux-2.6/compat-2.6/time.c
 openvswitch_headers += \
        linux-2.6/compat-2.6/compat26.h \
        linux-2.6/compat-2.6/include/asm-generic/bug.h \
+       linux-2.6/compat-2.6/include/linux/bottom_half.h \
+       linux-2.6/compat-2.6/include/linux/compiler.h \
+       linux-2.6/compat-2.6/include/linux/compiler-gcc.h \
        linux-2.6/compat-2.6/include/linux/cpumask.h \
        linux-2.6/compat-2.6/include/linux/dmi.h \
        linux-2.6/compat-2.6/include/linux/err.h \
@@ -16,6 +20,7 @@ openvswitch_headers += \
        linux-2.6/compat-2.6/include/linux/if.h \
        linux-2.6/compat-2.6/include/linux/if_arp.h \
        linux-2.6/compat-2.6/include/linux/if_ether.h \
+       linux-2.6/compat-2.6/include/linux/if_vlan.h \
        linux-2.6/compat-2.6/include/linux/in.h \
        linux-2.6/compat-2.6/include/linux/inetdevice.h \
        linux-2.6/compat-2.6/include/linux/ip.h \
@@ -30,7 +35,6 @@ openvswitch_headers += \
        linux-2.6/compat-2.6/include/linux/netfilter_bridge.h \
        linux-2.6/compat-2.6/include/linux/netfilter_ipv4.h \
        linux-2.6/compat-2.6/include/linux/netlink.h \
-       linux-2.6/compat-2.6/include/linux/random.h \
        linux-2.6/compat-2.6/include/linux/rculist.h \
        linux-2.6/compat-2.6/include/linux/rtnetlink.h \
        linux-2.6/compat-2.6/include/linux/skbuff.h \
@@ -46,6 +50,7 @@ openvswitch_headers += \
        linux-2.6/compat-2.6/include/net/genetlink.h \
        linux-2.6/compat-2.6/include/net/ip.h \
        linux-2.6/compat-2.6/include/net/netlink.h \
+       linux-2.6/compat-2.6/include/net/protocol.h \
        linux-2.6/compat-2.6/include/net/route.h
 
 both_modules += brcompat
@@ -55,8 +60,3 @@ brcompat_sources = \
        brc_procfs.c
 brcompat_headers = \
        brc_procfs.h
-
-dist_modules += veth
-build_modules += $(if $(BUILD_VETH),veth)
-veth_sources = linux-2.6/compat-2.6/veth.c
-veth_headers =