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
5e3a3fbd
Commit
5e3a3fbd
authored
Nov 09, 2010
by
Paul Mundt
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rmobile/core' into rmobile-fixes-for-linus
parents
a7bcf21e
2e351ec6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-ap4evb.c
+2
-0
arch/arm/mach-shmobile/intc-sh7372.c
arch/arm/mach-shmobile/intc-sh7372.c
+1
-1
No files found.
arch/arm/mach-shmobile/board-ap4evb.c
View file @
5e3a3fbd
...
@@ -163,11 +163,13 @@ static struct mtd_partition nor_flash_partitions[] = {
...
@@ -163,11 +163,13 @@ static struct mtd_partition nor_flash_partitions[] = {
.
name
=
"loader"
,
.
name
=
"loader"
,
.
offset
=
0x00000000
,
.
offset
=
0x00000000
,
.
size
=
512
*
1024
,
.
size
=
512
*
1024
,
.
mask_flags
=
MTD_WRITEABLE
,
},
},
{
{
.
name
=
"bootenv"
,
.
name
=
"bootenv"
,
.
offset
=
MTDPART_OFS_APPEND
,
.
offset
=
MTDPART_OFS_APPEND
,
.
size
=
512
*
1024
,
.
size
=
512
*
1024
,
.
mask_flags
=
MTD_WRITEABLE
,
},
},
{
{
.
name
=
"kernel_ro"
,
.
name
=
"kernel_ro"
,
...
...
arch/arm/mach-shmobile/intc-sh7372.c
View file @
5e3a3fbd
...
@@ -98,7 +98,7 @@ static struct intc_vect intca_vectors[] __initdata = {
...
@@ -98,7 +98,7 @@ static struct intc_vect intca_vectors[] __initdata = {
INTC_VECT
(
IRQ14A
,
0x03c0
),
INTC_VECT
(
IRQ15A
,
0x03e0
),
INTC_VECT
(
IRQ14A
,
0x03c0
),
INTC_VECT
(
IRQ15A
,
0x03e0
),
INTC_VECT
(
IRQ16A
,
0x3200
),
INTC_VECT
(
IRQ17A
,
0x3220
),
INTC_VECT
(
IRQ16A
,
0x3200
),
INTC_VECT
(
IRQ17A
,
0x3220
),
INTC_VECT
(
IRQ18A
,
0x3240
),
INTC_VECT
(
IRQ19A
,
0x3260
),
INTC_VECT
(
IRQ18A
,
0x3240
),
INTC_VECT
(
IRQ19A
,
0x3260
),
INTC_VECT
(
IRQ20A
,
0x3280
),
INTC_VECT
(
IRQ
3
1A
,
0x32a0
),
INTC_VECT
(
IRQ20A
,
0x3280
),
INTC_VECT
(
IRQ
2
1A
,
0x32a0
),
INTC_VECT
(
IRQ22A
,
0x32c0
),
INTC_VECT
(
IRQ23A
,
0x32e0
),
INTC_VECT
(
IRQ22A
,
0x32c0
),
INTC_VECT
(
IRQ23A
,
0x32e0
),
INTC_VECT
(
IRQ24A
,
0x3300
),
INTC_VECT
(
IRQ25A
,
0x3320
),
INTC_VECT
(
IRQ24A
,
0x3300
),
INTC_VECT
(
IRQ25A
,
0x3320
),
INTC_VECT
(
IRQ26A
,
0x3340
),
INTC_VECT
(
IRQ27A
,
0x3360
),
INTC_VECT
(
IRQ26A
,
0x3340
),
INTC_VECT
(
IRQ27A
,
0x3360
),
...
...
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