Merge branches 'acpi-video' and 'acpi-cppc'

[firefly-linux-kernel-4.4.55.git] / drivers / nfc / nfcsim.c

diff --git a/drivers/nfc/nfcsim.c b/drivers/nfc/nfcsim.c
index 93111fa8d2829735ec1ddea6c09c6da86bbb9459..26ac9e5fa1ab256277e543548484268c033243fc 100644 (file)
--- a/drivers/nfc/nfcsim.c
+++ b/drivers/nfc/nfcsim.c
@@ -246,7 +246,7 @@ static int nfcsim_activate_target(struct nfc_dev *nfc_dev,
 }
 
 static void nfcsim_deactivate_target(struct nfc_dev *nfc_dev,
-                                    struct nfc_target *target)
+                                    struct nfc_target *target, u8 mode)
 {
        struct nfcsim *dev = nfc_get_drvdata(nfc_dev);