Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
386bfcf5
Commit
386bfcf5
authored
Jun 13, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
980802e3
a8fa3f0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa25x.c
+4
-0
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa27x.c
+4
-0
No files found.
arch/arm/mach-pxa/pxa25x.c
View file @
386bfcf5
...
...
@@ -16,6 +16,7 @@
* initialization stuff for PXA machines which can be overridden later if
* need be.
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
...
...
@@ -103,6 +104,7 @@ unsigned int get_lcdclk_frequency_10khz(void)
EXPORT_SYMBOL
(
get_lcdclk_frequency_10khz
);
#ifdef CONFIG_PM
int
pxa_cpu_pm_prepare
(
suspend_state_t
state
)
{
...
...
@@ -131,3 +133,5 @@ void pxa_cpu_pm_enter(suspend_state_t state)
break
;
}
}
#endif
arch/arm/mach-pxa/pxa27x.c
View file @
386bfcf5
...
...
@@ -120,6 +120,8 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
EXPORT_SYMBOL
(
get_memclk_frequency_10khz
);
EXPORT_SYMBOL
(
get_lcdclk_frequency_10khz
);
#ifdef CONFIG_PM
int
pxa_cpu_pm_prepare
(
suspend_state_t
state
)
{
switch
(
state
)
{
...
...
@@ -153,6 +155,8 @@ void pxa_cpu_pm_enter(suspend_state_t state)
}
}
#endif
/*
* device registration specific to PXA27x.
*/
...
...
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