Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
94d40b69
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
94d40b69
编写于
12月 12, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
上级
062dfa43
1df2ab48
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
3 addition
and
12 deletion
+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
未找到文件。
arch/sparc/Makefile
浏览文件 @
94d40b69
...
@@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/
...
@@ -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-)
# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)
INIT_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
init-y
))
INIT_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
init-y
))
CORE_Y
:=
$
(
core-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)
)
CORE_Y
:=
$(
patsubst
%/, %/built-in.o,
$(CORE_Y)
)
DRIVERS_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
drivers-y
))
DRIVERS_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
drivers-y
))
NET_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
net-y
))
NET_Y
:=
$(
patsubst
%/, %/built-in.o,
$
(
net-y
))
...
...
arch/sparc/lib/atomic32.c
浏览文件 @
94d40b69
...
@@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u)
...
@@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u)
return
ret
!=
u
;
return
ret
!=
u
;
}
}
static
inline
void
atomic_clear_mask
(
unsigned
long
mask
,
unsigned
long
*
addr
)
/* Atomic operations are already serializing */
/* Atomic operations are already serializing */
void
atomic_set
(
atomic_t
*
v
,
int
i
)
void
atomic_set
(
atomic_t
*
v
,
int
i
)
{
{
...
...
drivers/video/bw2.c
浏览文件 @
94d40b69
...
@@ -121,7 +121,6 @@ struct bw2_par {
...
@@ -121,7 +121,6 @@ struct bw2_par {
unsigned
long
fbsize
;
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
};
/**
/**
...
...
drivers/video/cg14.c
浏览文件 @
94d40b69
...
@@ -206,7 +206,6 @@ struct cg14_par {
...
@@ -206,7 +206,6 @@ struct cg14_par {
int
mode
;
int
mode
;
int
ramsize
;
int
ramsize
;
struct
sbus_dev
*
sdev
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
};
static
void
__cg14_reset
(
struct
cg14_par
*
par
)
static
void
__cg14_reset
(
struct
cg14_par
*
par
)
...
...
drivers/video/cg3.c
浏览文件 @
94d40b69
...
@@ -124,7 +124,6 @@ struct cg3_par {
...
@@ -124,7 +124,6 @@ struct cg3_par {
unsigned
long
fbsize
;
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
};
/**
/**
...
...
drivers/video/cg6.c
浏览文件 @
94d40b69
...
@@ -265,7 +265,6 @@ struct cg6_par {
...
@@ -265,7 +265,6 @@ struct cg6_par {
unsigned
long
fbsize
;
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
};
static
int
cg6_sync
(
struct
fb_info
*
info
)
static
int
cg6_sync
(
struct
fb_info
*
info
)
...
@@ -612,7 +611,7 @@ static void cg6_chip_init(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_par
*
par
=
(
struct
cg6_par
*
)
info
->
par
;
struct
cg6_tec
__iomem
*
tec
=
par
->
tec
;
struct
cg6_tec
__iomem
*
tec
=
par
->
tec
;
struct
cg6_fbc
__iomem
*
fbc
=
par
->
fbc
;
struct
cg6_fbc
__iomem
*
fbc
=
par
->
fbc
;
u32
rev
,
conf
,
mode
,
tmp
;
u32
rev
,
conf
,
mode
;
int
i
;
int
i
;
/* Turn off stuff in the Transform Engine. */
/* Turn off stuff in the Transform Engine. */
...
...
drivers/video/ffb.c
浏览文件 @
94d40b69
...
@@ -359,7 +359,6 @@ struct ffb_par {
...
@@ -359,7 +359,6 @@ struct ffb_par {
int
prom_parent_node
;
int
prom_parent_node
;
int
dac_rev
;
int
dac_rev
;
int
board_type
;
int
board_type
;
struct
list_head
list
;
};
};
static
void
FFBFifo
(
struct
ffb_par
*
par
,
int
n
)
static
void
FFBFifo
(
struct
ffb_par
*
par
,
int
n
)
...
...
drivers/video/leo.c
浏览文件 @
94d40b69
...
@@ -197,7 +197,6 @@ struct leo_par {
...
@@ -197,7 +197,6 @@ struct leo_par {
unsigned
long
fbsize
;
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
};
static
void
leo_wait
(
struct
leo_lx_krn
__iomem
*
lx_krn
)
static
void
leo_wait
(
struct
leo_lx_krn
__iomem
*
lx_krn
)
...
...
drivers/video/p9100.c
浏览文件 @
94d40b69
...
@@ -140,7 +140,6 @@ struct p9100_par {
...
@@ -140,7 +140,6 @@ struct p9100_par {
unsigned
long
fbsize
;
unsigned
long
fbsize
;
struct
sbus_dev
*
sdev
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
};
/**
/**
...
...
drivers/video/tcx.c
浏览文件 @
94d40b69
...
@@ -125,7 +125,6 @@ struct tcx_par {
...
@@ -125,7 +125,6 @@ struct tcx_par {
int
lowdepth
;
int
lowdepth
;
struct
sbus_dev
*
sdev
;
struct
sbus_dev
*
sdev
;
struct
list_head
list
;
};
};
/* Reset control plane so that WID is 8-bit plane. */
/* Reset control plane so that WID is 8-bit plane. */
...
@@ -444,7 +443,7 @@ static void tcx_init_one(struct sbus_dev *sdev)
...
@@ -444,7 +443,7 @@ static void tcx_init_one(struct sbus_dev *sdev)
tcx_reset
(
&
all
->
info
);
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
))
{
if
(
fb_alloc_cmap
(
&
all
->
info
.
cmap
,
256
,
0
))
{
printk
(
KERN_ERR
"tcx: Could not allocate color map.
\n
"
);
printk
(
KERN_ERR
"tcx: Could not allocate color map.
\n
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录