diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-06-02 17:49:10 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-06-02 17:49:10 -0700 |
| commit | eadcbfa58ae8693f0d6a0f591d8f51d55cf068e1 (patch) | |
| tree | cff3f1c56a8bf15138b652ee9dab50dddd6edee5 /drivers/fpga/fpga-mgr.c | |
| parent | c4beedb8a914af9c8c1b6e67c753adf411e05160 (diff) | |
| parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
Merge tag 'v4.12-rc3' into for-linus
Merge with mainline to get acpi_dev_present() needed by patches to
axp20x-pek driver.
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
| -rw-r--r-- | drivers/fpga/fpga-mgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index 86d2cb203533..188ffefa3cc3 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -361,7 +361,7 @@ static struct attribute *fpga_mgr_attrs[] = { }; ATTRIBUTE_GROUPS(fpga_mgr); -struct fpga_manager *__fpga_mgr_get(struct device *dev) +static struct fpga_manager *__fpga_mgr_get(struct device *dev) { struct fpga_manager *mgr; int ret = -ENODEV; |