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
Kirill Smelkov
linux
Commits
b94bc499
Commit
b94bc499
authored
Sep 16, 2004
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SPARC64]: Fix iomem warnings in i8042-sparcio.h
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
0b1bf988
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
drivers/input/serio/i8042-sparcio.h
drivers/input/serio/i8042-sparcio.h
+4
-4
No files found.
drivers/input/serio/i8042-sparcio.h
View file @
b94bc499
...
@@ -18,7 +18,7 @@ static int i8042_aux_irq = -1;
...
@@ -18,7 +18,7 @@ static int i8042_aux_irq = -1;
#define I8042_AUX_PHYS_DESC "sparcps2/serio1"
#define I8042_AUX_PHYS_DESC "sparcps2/serio1"
#define I8042_MUX_PHYS_DESC "sparcps2/serio%d"
#define I8042_MUX_PHYS_DESC "sparcps2/serio%d"
static
unsigned
long
kbd_iobase
;
static
void
__iomem
*
kbd_iobase
;
#define I8042_COMMAND_REG (kbd_iobase + 0x64UL)
#define I8042_COMMAND_REG (kbd_iobase + 0x64UL)
#define I8042_DATA_REG (kbd_iobase + 0x60UL)
#define I8042_DATA_REG (kbd_iobase + 0x60UL)
...
@@ -64,7 +64,7 @@ static int i8042_platform_init(void)
...
@@ -64,7 +64,7 @@ static int i8042_platform_init(void)
if
(
strncmp
(
prop
,
"SUNW,JavaStation-1"
,
len
)
==
0
)
{
if
(
strncmp
(
prop
,
"SUNW,JavaStation-1"
,
len
)
==
0
)
{
/* Hardcoded values for MrCoffee. */
/* Hardcoded values for MrCoffee. */
i8042_kbd_irq
=
i8042_aux_irq
=
13
|
0x20
;
i8042_kbd_irq
=
i8042_aux_irq
=
13
|
0x20
;
kbd_iobase
=
(
unsigned
long
)
ioremap
(
0x71300060
,
8
);
kbd_iobase
=
ioremap
(
0x71300060
,
8
);
if
(
!
kbd_iobase
)
if
(
!
kbd_iobase
)
return
-
1
;
return
-
1
;
}
else
{
}
else
{
...
@@ -85,7 +85,7 @@ static int i8042_platform_init(void)
...
@@ -85,7 +85,7 @@ static int i8042_platform_init(void)
if
(
!
strcmp
(
child
->
prom_name
,
OBP_PS2KBD_NAME1
)
||
if
(
!
strcmp
(
child
->
prom_name
,
OBP_PS2KBD_NAME1
)
||
!
strcmp
(
child
->
prom_name
,
OBP_PS2KBD_NAME2
))
{
!
strcmp
(
child
->
prom_name
,
OBP_PS2KBD_NAME2
))
{
i8042_kbd_irq
=
child
->
irqs
[
0
];
i8042_kbd_irq
=
child
->
irqs
[
0
];
kbd_iobase
=
(
unsigned
long
)
kbd_iobase
=
ioremap
(
child
->
resource
[
0
].
start
,
8
);
ioremap
(
child
->
resource
[
0
].
start
,
8
);
}
}
if
(
!
strcmp
(
child
->
prom_name
,
OBP_PS2MS_NAME1
)
||
if
(
!
strcmp
(
child
->
prom_name
,
OBP_PS2MS_NAME1
)
||
...
@@ -109,7 +109,7 @@ static int i8042_platform_init(void)
...
@@ -109,7 +109,7 @@ static int i8042_platform_init(void)
static
inline
void
i8042_platform_exit
(
void
)
static
inline
void
i8042_platform_exit
(
void
)
{
{
#ifdef CONFIG_PCI
#ifdef CONFIG_PCI
iounmap
(
(
void
*
)
kbd_iobase
);
iounmap
(
kbd_iobase
);
#endif
#endif
}
}
...
...
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