diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-07-27 14:43:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-07-27 14:43:29 +0200 |
| commit | 527c465a3c8716d93201ae34b7fc52679610596d (patch) | |
| tree | e436b076df094caba9809b9c622374d396e84435 /net/rose/rose_route.c | |
| parent | fbce23a0b95763dfc4961ce6240e055c39f497ed (diff) | |
| parent | 5ce000b297a1c1bb126a14b02acb40318b88a903 (diff) | |
| download | blackbird-obmc-linux-527c465a3c8716d93201ae34b7fc52679610596d.tar.gz blackbird-obmc-linux-527c465a3c8716d93201ae34b7fc52679610596d.zip | |
Merge branch 'for-linus' into for-next
... to make easier developing HDA ext code.
Diffstat (limited to 'net/rose/rose_route.c')
| -rw-r--r-- | net/rose/rose_route.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index 40148932c8a4..0fc76d845103 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c @@ -31,7 +31,6 @@ #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/notifier.h> -#include <linux/netfilter.h> #include <linux/init.h> #include <net/rose.h> #include <linux/seq_file.h> |
