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
d035953e
Commit
d035953e
authored
Sep 12, 2011
by
Arnd Bergmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sirf/fixes' into fixes
parents
1f51b001
6a53747b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
0 deletions
+4
-0
arch/arm/mach-prima2/clock.c
arch/arm/mach-prima2/clock.c
+1
-0
arch/arm/mach-prima2/irq.c
arch/arm/mach-prima2/irq.c
+1
-0
arch/arm/mach-prima2/rstc.c
arch/arm/mach-prima2/rstc.c
+1
-0
arch/arm/mach-prima2/timer.c
arch/arm/mach-prima2/timer.c
+1
-0
No files found.
arch/arm/mach-prima2/clock.c
View file @
d035953e
...
@@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void)
...
@@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void)
static
struct
of_device_id
clkc_ids
[]
=
{
static
struct
of_device_id
clkc_ids
[]
=
{
{
.
compatible
=
"sirf,prima2-clkc"
},
{
.
compatible
=
"sirf,prima2-clkc"
},
{},
};
};
void
__init
sirfsoc_of_clk_init
(
void
)
void
__init
sirfsoc_of_clk_init
(
void
)
...
...
arch/arm/mach-prima2/irq.c
View file @
d035953e
...
@@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void)
...
@@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void)
static
struct
of_device_id
intc_ids
[]
=
{
static
struct
of_device_id
intc_ids
[]
=
{
{
.
compatible
=
"sirf,prima2-intc"
},
{
.
compatible
=
"sirf,prima2-intc"
},
{},
};
};
void
__init
sirfsoc_of_irq_init
(
void
)
void
__init
sirfsoc_of_irq_init
(
void
)
...
...
arch/arm/mach-prima2/rstc.c
View file @
d035953e
...
@@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock);
...
@@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock);
static
struct
of_device_id
rstc_ids
[]
=
{
static
struct
of_device_id
rstc_ids
[]
=
{
{
.
compatible
=
"sirf,prima2-rstc"
},
{
.
compatible
=
"sirf,prima2-rstc"
},
{},
};
};
static
int
__init
sirfsoc_of_rstc_init
(
void
)
static
int
__init
sirfsoc_of_rstc_init
(
void
)
...
...
arch/arm/mach-prima2/timer.c
View file @
d035953e
...
@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void)
...
@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void)
static
struct
of_device_id
timer_ids
[]
=
{
static
struct
of_device_id
timer_ids
[]
=
{
{
.
compatible
=
"sirf,prima2-tick"
},
{
.
compatible
=
"sirf,prima2-tick"
},
{},
};
};
static
void
__init
sirfsoc_of_timer_map
(
void
)
static
void
__init
sirfsoc_of_timer_map
(
void
)
...
...
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