diff options
author | Helge Deller <deller@gmx.de> | 2017-08-21 15:54:23 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2017-08-22 10:34:35 -0400 |
commit | 6aaf7934cfcd3884c852ad88559c228a53b413f7 (patch) | |
tree | 362b4490552967fbb288614af8865dab944c9a56 | |
parent | c8dbaa2261197a648673cc14a280fe7dac73ca5d (diff) |
parisc/sticore: Fix section mismatches
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r-- | drivers/video/console/sticore.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 7da1ad03acb5..d1d3796773aa 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c | |||
@@ -281,7 +281,7 @@ static void sti_rom_copy(unsigned long base, unsigned long count, void *dest) | |||
281 | static char default_sti_path[21] __read_mostly; | 281 | static char default_sti_path[21] __read_mostly; |
282 | 282 | ||
283 | #ifndef MODULE | 283 | #ifndef MODULE |
284 | static int sti_setup(char *str) | 284 | static int __init sti_setup(char *str) |
285 | { | 285 | { |
286 | if (str) | 286 | if (str) |
287 | strlcpy (default_sti_path, str, sizeof (default_sti_path)); | 287 | strlcpy (default_sti_path, str, sizeof (default_sti_path)); |
@@ -941,7 +941,7 @@ static void sticore_check_for_default_sti(struct sti_struct *sti, char *path) | |||
941 | * in the additional address field addr[1] while on | 941 | * in the additional address field addr[1] while on |
942 | * older Systems the PDC stores it in page0->proc_sti | 942 | * older Systems the PDC stores it in page0->proc_sti |
943 | */ | 943 | */ |
944 | static int sticore_pa_init(struct parisc_device *dev) | 944 | static int __init sticore_pa_init(struct parisc_device *dev) |
945 | { | 945 | { |
946 | char pa_path[21]; | 946 | char pa_path[21]; |
947 | struct sti_struct *sti = NULL; | 947 | struct sti_struct *sti = NULL; |
@@ -1009,7 +1009,7 @@ static int sticore_pci_init(struct pci_dev *pd, const struct pci_device_id *ent) | |||
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | 1011 | ||
1012 | static void sticore_pci_remove(struct pci_dev *pd) | 1012 | static void __exit sticore_pci_remove(struct pci_dev *pd) |
1013 | { | 1013 | { |
1014 | BUG(); | 1014 | BUG(); |
1015 | } | 1015 | } |
@@ -1029,7 +1029,7 @@ static struct pci_driver pci_sti_driver = { | |||
1029 | .name = "sti", | 1029 | .name = "sti", |
1030 | .id_table = sti_pci_tbl, | 1030 | .id_table = sti_pci_tbl, |
1031 | .probe = sticore_pci_init, | 1031 | .probe = sticore_pci_init, |
1032 | .remove = sticore_pci_remove, | 1032 | .remove = __exit_p(sticore_pci_remove), |
1033 | }; | 1033 | }; |
1034 | 1034 | ||
1035 | static struct parisc_device_id sti_pa_tbl[] = { | 1035 | static struct parisc_device_id sti_pa_tbl[] = { |
@@ -1037,8 +1037,9 @@ static struct parisc_device_id sti_pa_tbl[] = { | |||
1037 | { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00085 }, | 1037 | { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00085 }, |
1038 | { 0, } | 1038 | { 0, } |
1039 | }; | 1039 | }; |
1040 | MODULE_DEVICE_TABLE(parisc, sti_pa_tbl); | ||
1040 | 1041 | ||
1041 | static struct parisc_driver pa_sti_driver = { | 1042 | static struct parisc_driver pa_sti_driver __refdata = { |
1042 | .name = "sti", | 1043 | .name = "sti", |
1043 | .id_table = sti_pa_tbl, | 1044 | .id_table = sti_pa_tbl, |
1044 | .probe = sticore_pa_init, | 1045 | .probe = sticore_pa_init, |