Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6aaf7934
Commit
6aaf7934
authored
Aug 21, 2017
by
Helge Deller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parisc/sticore: Fix section mismatches
Signed-off-by:
Helge Deller
<
deller@gmx.de
>
parent
c8dbaa22
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
drivers/video/console/sticore.c
drivers/video/console/sticore.c
+6
-5
No files found.
drivers/video/console/sticore.c
View file @
6aaf7934
...
...
@@ -281,7 +281,7 @@ static void sti_rom_copy(unsigned long base, unsigned long count, void *dest)
static
char
default_sti_path
[
21
]
__read_mostly
;
#ifndef MODULE
static
int
sti_setup
(
char
*
str
)
static
int
__init
sti_setup
(
char
*
str
)
{
if
(
str
)
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)
* in the additional address field addr[1] while on
* older Systems the PDC stores it in page0->proc_sti
*/
static
int
sticore_pa_init
(
struct
parisc_device
*
dev
)
static
int
__init
sticore_pa_init
(
struct
parisc_device
*
dev
)
{
char
pa_path
[
21
];
struct
sti_struct
*
sti
=
NULL
;
...
...
@@ -1009,7 +1009,7 @@ static int sticore_pci_init(struct pci_dev *pd, const struct pci_device_id *ent)
}
static
void
sticore_pci_remove
(
struct
pci_dev
*
pd
)
static
void
__exit
sticore_pci_remove
(
struct
pci_dev
*
pd
)
{
BUG
();
}
...
...
@@ -1029,7 +1029,7 @@ static struct pci_driver pci_sti_driver = {
.
name
=
"sti"
,
.
id_table
=
sti_pci_tbl
,
.
probe
=
sticore_pci_init
,
.
remove
=
sticore_pci_remove
,
.
remove
=
__exit_p
(
sticore_pci_remove
)
,
};
static
struct
parisc_device_id
sti_pa_tbl
[]
=
{
...
...
@@ -1037,8 +1037,9 @@ static struct parisc_device_id sti_pa_tbl[] = {
{
HPHW_FIO
,
HVERSION_REV_ANY_ID
,
HVERSION_ANY_ID
,
0x00085
},
{
0
,
}
};
MODULE_DEVICE_TABLE
(
parisc
,
sti_pa_tbl
);
static
struct
parisc_driver
pa_sti_driver
=
{
static
struct
parisc_driver
pa_sti_driver
__refdata
=
{
.
name
=
"sti"
,
.
id_table
=
sti_pa_tbl
,
.
probe
=
sticore_pa_init
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment