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
67553751
Commit
67553751
authored
Nov 12, 2004
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Fix IMX build error post sys_timer merge.
parent
6a8a8108
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
arch/arm/mach-imx/time.c
arch/arm/mach-imx/time.c
+3
-5
No files found.
arch/arm/mach-imx/time.c
View file @
67553751
...
@@ -28,8 +28,7 @@
...
@@ -28,8 +28,7 @@
* Returns number of us since last clock interrupt. Note that interrupts
* Returns number of us since last clock interrupt. Note that interrupts
* will have been disabled by do_gettimeoffset()
* will have been disabled by do_gettimeoffset()
*/
*/
static
unsigned
long
static
unsigned
long
imx_gettimeoffset
(
void
)
imx_gettimeoffset
(
void
)
{
{
unsigned
long
ticks
;
unsigned
long
ticks
;
...
@@ -80,8 +79,7 @@ static struct irqaction imx_timer_irq = {
...
@@ -80,8 +79,7 @@ static struct irqaction imx_timer_irq = {
/*
/*
* Set up timer interrupt, and return the current time in seconds.
* Set up timer interrupt, and return the current time in seconds.
*/
*/
static
void
__init
static
void
__init
imx_timer_init
(
void
)
imx_timer_init
(
void
)
{
{
/*
/*
* Initialise to a known state (all timers off, and timing reset)
* Initialise to a known state (all timers off, and timing reset)
...
@@ -97,7 +95,7 @@ imx_timer_init(void)
...
@@ -97,7 +95,7 @@ imx_timer_init(void)
setup_irq
(
TIM1_INT
,
&
imx_timer_irq
);
setup_irq
(
TIM1_INT
,
&
imx_timer_irq
);
}
}
struct
imx_timer
=
{
struct
sys_timer
imx_timer
=
{
.
init
=
imx_timer_init
,
.
init
=
imx_timer_init
,
.
offset
=
imx_gettimeoffset
,
.
offset
=
imx_gettimeoffset
,
};
};
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