diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-18 09:11:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-18 09:11:19 +1000 |
| commit | 8bae184b618a12058af275c50e5659df3a967833 (patch) | |
| tree | 238688a871b37cbbb2a9fee6ee89b85588c5b625 /drivers | |
| parent | 05bfa9ec4e5458102a9acd03449e38f83e0d2d9c (diff) | |
| parent | 7d9fb74454a730808bc5b383d9545eca4c914e90 (diff) | |
Merge remote-tracking branch 'at91/at91-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/memory/atmel-ebi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c index 35910f945bfa..99e644cda4d1 100644 --- a/drivers/memory/atmel-ebi.c +++ b/drivers/memory/atmel-ebi.c @@ -581,7 +581,7 @@ static int atmel_ebi_probe(struct platform_device *pdev) return of_platform_populate(np, NULL, NULL, dev); } -static int atmel_ebi_resume(struct device *dev) +static __maybe_unused int atmel_ebi_resume(struct device *dev) { struct atmel_ebi *ebi = dev_get_drvdata(dev); struct atmel_ebi_dev *ebid; |