diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | |
| parent | 0b498a52778368ff501557d68c7b50878ab1701e (diff) | |
| parent | e4e98c460ad38c78498622a164fd5ef09a2dc9cb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c index dbcd0303afed..63c5ab6489c9 100644 --- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c +++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c @@ -222,7 +222,6 @@ static const struct of_device_id mcu_of_match_table[] = { static struct i2c_driver mcu_driver = { .driver = { .name = "mcu-mpc8349emitx", - .owner = THIS_MODULE, .of_match_table = mcu_of_match_table, }, .probe = mcu_probe, |