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
94d40b69
Commit
94d40b69
authored
Dec 12, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
parents
062dfa43
1df2ab48
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
3 additions
and
12 deletions
+3
-12
arch/sparc/Makefile
arch/sparc/Makefile
+1
-1
arch/sparc/lib/atomic32.c
arch/sparc/lib/atomic32.c
+0
-1
drivers/video/bw2.c
drivers/video/bw2.c
+0
-1
drivers/video/cg14.c
drivers/video/cg14.c
+0
-1
drivers/video/cg3.c
drivers/video/cg3.c
+0
-1
drivers/video/cg6.c
drivers/video/cg6.c
+1
-2
drivers/video/ffb.c
drivers/video/ffb.c
+0
-1
drivers/video/leo.c
drivers/video/leo.c
+0
-1
drivers/video/p9100.c
drivers/video/p9100.c
+0
-1
drivers/video/tcx.c
drivers/video/tcx.c
+1
-2
No files found.
arch/sparc/Makefile
View file @
94d40b69
...
...
@@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/
# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)
INIT_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
init-y
))
CORE_Y
:=
$
(
core-y
)
CORE_Y
+=
kernel/ mm/ fs/ ipc/ security/ crypto/
CORE_Y
+=
kernel/ mm/ fs/ ipc/ security/ crypto/
block/
CORE_Y
:=
$(
patsubst
%/, %/built-in.o,
$(CORE_Y)
)
DRIVERS_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
drivers-y
))
NET_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
net-y
))
...
...
arch/sparc/lib/atomic32.c
View file @
94d40b69
...
...
@@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u)
return
ret
!=
u
;
}
static
inline
void
atomic_clear_mask
(
unsigned
long
mask
,
unsigned
long
*
addr
)
/* Atomic operations are already serializing */
void
atomic_set
(
atomic_t
*
v
,
int
i
)
{
...
...
drivers/video/bw2.c
View file @
94d40b69
...
...
@@ -121,7 +121,6 @@ struct bw2_par {
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
/**
...
...
drivers/video/cg14.c
View file @
94d40b69
...
...
@@ -206,7 +206,6 @@ struct cg14_par {
int
mode
;
int
ramsize
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
static
void
__cg14_reset
(
struct
cg14_par
*
par
)
...
...
drivers/video/cg3.c
View file @
94d40b69
...
...
@@ -124,7 +124,6 @@ struct cg3_par {
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
/**
...
...
drivers/video/cg6.c
View file @
94d40b69
...
...
@@ -265,7 +265,6 @@ struct cg6_par {
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
static
int
cg6_sync
(
struct
fb_info
*
info
)
...
...
@@ -612,7 +611,7 @@ static void cg6_chip_init(struct fb_info *info)
struct
cg6_par
*
par
=
(
struct
cg6_par
*
)
info
->
par
;
struct
cg6_tec
__iomem
*
tec
=
par
->
tec
;
struct
cg6_fbc
__iomem
*
fbc
=
par
->
fbc
;
u32
rev
,
conf
,
mode
,
tmp
;
u32
rev
,
conf
,
mode
;
int
i
;
/* Turn off stuff in the Transform Engine. */
...
...
drivers/video/ffb.c
View file @
94d40b69
...
...
@@ -359,7 +359,6 @@ struct ffb_par {
int
prom_parent_node
;
int
dac_rev
;
int
board_type
;
struct
list_head
list
;
};
static
void
FFBFifo
(
struct
ffb_par
*
par
,
int
n
)
...
...
drivers/video/leo.c
View file @
94d40b69
...
...
@@ -197,7 +197,6 @@ struct leo_par {
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
static
void
leo_wait
(
struct
leo_lx_krn
__iomem
*
lx_krn
)
...
...
drivers/video/p9100.c
View file @
94d40b69
...
...
@@ -140,7 +140,6 @@ struct p9100_par {
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
/**
...
...
drivers/video/tcx.c
View file @
94d40b69
...
...
@@ -125,7 +125,6 @@ struct tcx_par {
int
lowdepth
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
/* Reset control plane so that WID is 8-bit plane. */
...
...
@@ -444,7 +443,7 @@ static void tcx_init_one(struct sbus_dev *sdev)
tcx_reset
(
&
all
->
info
);
tcx_blank
(
0
,
&
all
->
info
);
tcx_blank
(
FB_BLANK_UNBLANK
,
&
all
->
info
);
if
(
fb_alloc_cmap
(
&
all
->
info
.
cmap
,
256
,
0
))
{
printk
(
KERN_ERR
"tcx: Could not allocate color map.
\n
"
);
...
...
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