diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 13:20:40 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 13:20:40 +0300 |
commit | e8014d83f60479d3981baeaa3a21c993ff832f3f (patch) | |
tree | 90af78aea1a518c4c04d123e1473e8c4c729c221 /drivers/base/firmware_loader/fallback_table.c | |
parent | 41aef04524d3dc8c2a5d9652cccc1f567356b5fd (diff) | |
parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
download | linux-e8014d83f60479d3981baeaa3a21c993ff832f3f.tar.xz |
Merge 5.7-rc3 into staging-next
We need the staging fixes in here too, and this resolves a merge issue
with the vt6656 driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_loader/fallback_table.c')
-rw-r--r-- | drivers/base/firmware_loader/fallback_table.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c index ba9d30b28edc..a182e318bd09 100644 --- a/drivers/base/firmware_loader/fallback_table.c +++ b/drivers/base/firmware_loader/fallback_table.c @@ -45,5 +45,4 @@ struct ctl_table firmware_config_table[] = { }, { } }; -EXPORT_SYMBOL_GPL(firmware_config_table); #endif |