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
66b5920f
Commit
66b5920f
authored
Nov 21, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
49bd96c2
9b73fcf8
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
4 deletions
+8
-4
arch/arm/mach-clps7500/core.c
arch/arm/mach-clps7500/core.c
+1
-1
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/tosa.c
+1
-1
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/assabet.c
+2
-1
include/asm-arm/arch-ebsa110/io.h
include/asm-arm/arch-ebsa110/io.h
+1
-1
include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+1
-0
include/asm-arm/numnodes.h
include/asm-arm/numnodes.h
+2
-0
No files found.
arch/arm/mach-clps7500/core.c
View file @
66b5920f
...
@@ -260,7 +260,7 @@ static void __init clps7500_init_irq(void)
...
@@ -260,7 +260,7 @@ static void __init clps7500_init_irq(void)
static
struct
map_desc
cl7500_io_desc
[]
__initdata
=
{
static
struct
map_desc
cl7500_io_desc
[]
__initdata
=
{
{
/* IO space */
{
/* IO space */
.
virtual
=
IO_BASE
,
.
virtual
=
(
unsigned
long
)
IO_BASE
,
.
pfn
=
__phys_to_pfn
(
IO_START
),
.
pfn
=
__phys_to_pfn
(
IO_START
),
.
length
=
IO_SIZE
,
.
length
=
IO_SIZE
,
.
type
=
MT_DEVICE
.
type
=
MT_DEVICE
...
...
arch/arm/mach-pxa/tosa.c
View file @
66b5920f
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/
platform_
device.h>
#include <linux/major.h>
#include <linux/major.h>
#include <linux/fs.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
#include <linux/interrupt.h>
...
...
arch/arm/mach-sa1100/assabet.c
View file @
66b5920f
...
@@ -293,7 +293,8 @@ static void __init get_assabet_scr(void)
...
@@ -293,7 +293,8 @@ static void __init get_assabet_scr(void)
GPDR
|=
0x3fc
;
/* Configure GPIO 9:2 as outputs */
GPDR
|=
0x3fc
;
/* Configure GPIO 9:2 as outputs */
GPSR
=
0x3fc
;
/* Write 0xFF to GPIO 9:2 */
GPSR
=
0x3fc
;
/* Write 0xFF to GPIO 9:2 */
GPDR
&=
~
(
0x3fc
);
/* Configure GPIO 9:2 as inputs */
GPDR
&=
~
(
0x3fc
);
/* Configure GPIO 9:2 as inputs */
for
(
i
=
100
;
i
--
;
scr
=
GPLR
);
/* Read GPIO 9:2 */
for
(
i
=
100
;
i
--
;
)
/* Read GPIO 9:2 */
scr
=
GPLR
;
GPDR
|=
0x3fc
;
/* restore correct pin direction */
GPDR
|=
0x3fc
;
/* restore correct pin direction */
scr
&=
0x3fc
;
/* save as system configuration byte. */
scr
&=
0x3fc
;
/* save as system configuration byte. */
SCR_value
=
scr
;
SCR_value
=
scr
;
...
...
include/asm-arm/arch-ebsa110/io.h
View file @
66b5920f
...
@@ -64,7 +64,7 @@ void __writel(u32 val, void __iomem *addr);
...
@@ -64,7 +64,7 @@ void __writel(u32 val, void __iomem *addr);
#define writew(v,b) __writew(v,b)
#define writew(v,b) __writew(v,b)
#define writel(v,b) __writel(v,b)
#define writel(v,b) __writel(v,b)
#define __arch_ioremap(cookie,sz,c
,a
) ((void __iomem *)(cookie))
#define __arch_ioremap(cookie,sz,c) ((void __iomem *)(cookie))
#define __arch_iounmap(cookie) do { } while (0)
#define __arch_iounmap(cookie) do { } while (0)
extern
void
insb
(
unsigned
int
port
,
void
*
buf
,
int
sz
);
extern
void
insb
(
unsigned
int
port
,
void
*
buf
,
int
sz
);
...
...
include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
View file @
66b5920f
...
@@ -47,6 +47,7 @@
...
@@ -47,6 +47,7 @@
* Queue Manager
* Queue Manager
*/
*/
#define IXP4XX_QMGR_BASE_PHYS (0x60000000)
#define IXP4XX_QMGR_BASE_PHYS (0x60000000)
#define IXP4XX_QMGR_REGION_SIZE (0x00004000)
/*
/*
* Expansion BUS Configuration registers
* Expansion BUS Configuration registers
...
...
include/asm-arm/numnodes.h
View file @
66b5920f
...
@@ -17,6 +17,8 @@
...
@@ -17,6 +17,8 @@
#ifndef __ASM_ARM_NUMNODES_H
#ifndef __ASM_ARM_NUMNODES_H
#define __ASM_ARM_NUMNODES_H
#define __ASM_ARM_NUMNODES_H
#include <asm/memory.h>
#ifndef NODES_SHIFT
#ifndef NODES_SHIFT
# define NODES_SHIFT 2
/* Normally, Max 4 Nodes */
# define NODES_SHIFT 2
/* Normally, Max 4 Nodes */
#endif
#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