diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 11:09:40 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 11:09:40 -0500 |
| commit | ba4b60e85d6c5fc2242fd24e131a47fb922e5d89 (patch) | |
| tree | 6be918ce3924d0677bc1029f7d1255fef48a8f85 /net/caif/caif_dev.c | |
| parent | 5dba4c56dfa660a85dc8e897990948cdec3734bf (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
Merge 3.14-rc3 into char-misc-next
We need the fixes here for future mei and other patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/caif/caif_dev.c')
| -rw-r--r-- | net/caif/caif_dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index 4dca159435cf..edbca468fa73 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <net/pkt_sched.h> | 22 | #include <net/pkt_sched.h> |
| 23 | #include <net/caif/caif_device.h> | 23 | #include <net/caif/caif_device.h> |
| 24 | #include <net/caif/caif_layer.h> | 24 | #include <net/caif/caif_layer.h> |
| 25 | #include <net/caif/caif_dev.h> | ||
| 25 | #include <net/caif/cfpkt.h> | 26 | #include <net/caif/cfpkt.h> |
| 26 | #include <net/caif/cfcnfg.h> | 27 | #include <net/caif/cfcnfg.h> |
| 27 | #include <net/caif/cfserl.h> | 28 | #include <net/caif/cfserl.h> |