Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
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
Commits
3c081384
Commit
3c081384
authored
Mar 11, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 's3c-iis-header' into for-2.6.30
Conflicts: arch/arm/mach-shark/include/mach/io.h
parents
f455dfb1
a2b03461
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
arch/arm/mach-s3c2410/include/mach/hardware.h
arch/arm/mach-s3c2410/include/mach/hardware.h
+3
-0
arch/arm/mach-shark/include/mach/io.h
arch/arm/mach-shark/include/mach/io.h
+1
-2
No files found.
arch/arm/mach-s3c2410/include/mach/hardware.h
View file @
3c081384
...
...
@@ -131,4 +131,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);
/* machine specific hardware definitions should go after this */
/* currently here until moved into config (todo) */
#define CONFIG_NO_MULTIWORD_IO
#endif
/* __ASM_ARCH_HARDWARE_H */
arch/arm/mach-shark/include/mach/io.h
View file @
3c081384
...
...
@@ -14,8 +14,7 @@
#define PCIO_BASE 0xe0000000
#define IO_SPACE_LIMIT 0xffffffff
#define __io(a) __typesafe_io(PCIO_BASE + (a))
#define __io(a) ((void __iomem *)(PCIO_BASE + (a)))
#define __mem_pci(addr) (addr)
#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