diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-10 02:00:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-10 02:00:18 +0100 |
| commit | 4dc6758d7824a6d25717ccceefc488cafdb07210 (patch) | |
| tree | 992e5d5996910af35a5c12fe94da14d0bb167452 /net/qrtr | |
| parent | Merge branch 'dsa-setup-stage' (diff) | |
| parent | Merge tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| download | linux-4dc6758d7824a6d25717ccceefc488cafdb07210.tar.xz linux-4dc6758d7824a6d25717ccceefc488cafdb07210.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.
Must easier to resolve this time.
Which probably means that I screwed it up somehow.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/qrtr')
| -rw-r--r-- | net/qrtr/qrtr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index e458ece96d3d..77ab05e23001 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -1120,7 +1120,7 @@ static int __init qrtr_proto_init(void) return 0; } -module_init(qrtr_proto_init); +postcore_initcall(qrtr_proto_init); static void __exit qrtr_proto_fini(void) { |