diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-28 17:37:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-28 17:37:00 -0700 |
| commit | b26d344c6b87058ae3e8f919a18580abfc4204eb (patch) | |
| tree | ff7026df8e8715e3c63d0ff4ff697a9fac6323fb /drivers/mmc/host/mxs-mmc.c | |
| parent | 82aee5d7c01fd1a398e938e496e6cb8841775f91 (diff) | |
| parent | 76fbc247b9aebc30f6d2c8ec1f69edcb68eaa328 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/caif/caif_hsi.c
drivers/net/usb/qmi_wwan.c
The qmi_wwan merge was trivial.
The caif_hsi.c, on the other hand, was not. It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.
I did my best with that one and will ask Sjur to check it out.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/mmc/host/mxs-mmc.c')
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index 34a90266ab1..277161d279b 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -894,8 +894,8 @@ static struct platform_driver mxs_mmc_driver = { .owner = THIS_MODULE, #ifdef CONFIG_PM .pm = &mxs_mmc_pm_ops, - .of_match_table = mxs_mmc_dt_ids, #endif + .of_match_table = mxs_mmc_dt_ids, }, }; |