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
71b44396
Commit
71b44396
authored
May 19, 2010
by
Ben Dooks
Browse files
Options
Browse Files
Download
Plain Diff
ARM: Merge for-2635/samsung-clock
Merge branch 'for-2635/samsung-clock' into for-linus/samsung2
parents
f447ea4b
f001d5b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
arch/arm/plat-s5p/clock.c
arch/arm/plat-s5p/clock.c
+5
-0
arch/arm/plat-s5p/include/plat/s5p-clock.h
arch/arm/plat-s5p/include/plat/s5p-clock.h
+1
-0
No files found.
arch/arm/plat-s5p/clock.c
View file @
71b44396
...
@@ -33,6 +33,11 @@ struct clk clk_ext_xtal_mux = {
...
@@ -33,6 +33,11 @@ struct clk clk_ext_xtal_mux = {
.
id
=
-
1
,
.
id
=
-
1
,
};
};
struct
clk
clk_xusbxti
=
{
.
name
=
"xusbxti"
,
.
id
=
-
1
,
};
static
struct
clk
s5p_clk_27m
=
{
static
struct
clk
s5p_clk_27m
=
{
.
name
=
"clk_27m"
,
.
name
=
"clk_27m"
,
.
id
=
-
1
,
.
id
=
-
1
,
...
...
arch/arm/plat-s5p/include/plat/s5p-clock.h
View file @
71b44396
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#define clk_fin_vpll clk_ext_xtal_mux
#define clk_fin_vpll clk_ext_xtal_mux
extern
struct
clk
clk_ext_xtal_mux
;
extern
struct
clk
clk_ext_xtal_mux
;
extern
struct
clk
clk_xusbxti
;
extern
struct
clk
clk_48m
;
extern
struct
clk
clk_48m
;
extern
struct
clk
clk_fout_apll
;
extern
struct
clk
clk_fout_apll
;
extern
struct
clk
clk_fout_mpll
;
extern
struct
clk
clk_fout_mpll
;
...
...
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