Merge branch 'release/v5.0.0.rc6' into master

949cbe3f · Federico Vaga · ac355f2a · ab678500 · 949cbe3f
Commit 949cbe3f authored Aug 17, 2020 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

fa-core.c kernel/fa-core.c +3 -1

No files found.
--- a/kernel/fa-core.c
+++ b/kernel/fa-core.c
@@ -717,7 +717,8 @@ static const struct platform_device_id fa_id[] = {
 	{
 		.name = "fmc-adc-100m",
 		.driver_data = ADC_VER,
-	}
+	},
+	{},
 	/* TODO we should support different version */
 };

@@ -787,5 +788,6 @@ MODULE_AUTHOR("Federico Vaga");
 MODULE_DESCRIPTION("FMC-ADC-100MS-14b Linux Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(VERSION);
+MODULE_DEVICE_TABLE(platform, fa_id);

 ADDITIONAL_VERSIONS;