Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
f8872f4c
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f8872f4c
编写于
8月 10, 2006
作者:
G
Greg Kroah-Hartman
浏览文件
操作
浏览文件
下载
差异文件
Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
上级
99baa752
574dc0ab
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
7 addition
and
8 deletion
+7
-8
arch/arm/common/rtctime.c
arch/arm/common/rtctime.c
+1
-0
arch/arm/mach-ixp4xx/common-pci.c
arch/arm/mach-ixp4xx/common-pci.c
+0
-2
arch/arm/mach-ixp4xx/gtwx5715-setup.c
arch/arm/mach-ixp4xx/gtwx5715-setup.c
+2
-5
drivers/scsi/arm/Kconfig
drivers/scsi/arm/Kconfig
+3
-0
drivers/scsi/arm/scsi.h
drivers/scsi/arm/scsi.h
+1
-1
未找到文件。
arch/arm/common/rtctime.c
浏览文件 @
f8872f4c
...
...
@@ -68,6 +68,7 @@ void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc
rtc_time_to_tm
(
next_time
,
next
);
}
}
EXPORT_SYMBOL
(
rtc_next_alarm_time
);
static
inline
int
rtc_arm_read_time
(
struct
rtc_ops
*
ops
,
struct
rtc_time
*
tm
)
{
...
...
arch/arm/mach-ixp4xx/common-pci.c
浏览文件 @
f8872f4c
...
...
@@ -532,8 +532,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
return
-
EIO
;
}
EXPORT_SYMBOL
(
pci_set_dma_mask
);
EXPORT_SYMBOL
(
pci_set_consistent_dma_mask
);
EXPORT_SYMBOL
(
ixp4xx_pci_read
);
EXPORT_SYMBOL
(
ixp4xx_pci_write
);
arch/arm/mach-ixp4xx/gtwx5715-setup.c
浏览文件 @
f8872f4c
...
...
@@ -107,9 +107,9 @@ static struct flash_platform_data gtwx5715_flash_data = {
.
width
=
2
,
};
static
struct
gtw
5715_flash_resource
=
{
static
struct
resource
gtwx
5715_flash_resource
=
{
.
flags
=
IORESOURCE_MEM
,
}
}
;
static
struct
platform_device
gtwx5715_flash
=
{
.
name
=
"IXP4XX-Flash"
,
...
...
@@ -130,9 +130,6 @@ static void __init gtwx5715_init(void)
{
ixp4xx_sys_init
();
if
(
!
flash_resource
)
printk
(
KERN_ERR
"Could not allocate flash resource
\n
"
);
gtwx5715_flash_resource
.
start
=
IXP4XX_EXP_BUS_BASE
(
0
);
gtwx5715_flash_resource
.
end
=
IXP4XX_EXP_BUS_BASE
(
0
)
+
SZ_8M
-
1
;
...
...
drivers/scsi/arm/Kconfig
浏览文件 @
f8872f4c
...
...
@@ -69,6 +69,7 @@ comment "The following drivers are not fully supported"
config SCSI_CUMANA_1
tristate "CumanaSCSI I support (EXPERIMENTAL)"
depends on ARCH_ACORN && EXPERIMENTAL && SCSI
select SCSI_SPI_ATTRS
help
This enables support for the Cumana SCSI I card. If you have an
Acorn system with one of these, say Y. If unsure, say N.
...
...
@@ -76,6 +77,7 @@ config SCSI_CUMANA_1
config SCSI_ECOSCSI
tristate "EcoScsi support (EXPERIMENTAL)"
depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI
select SCSI_SPI_ATTRS
help
This enables support for the EcoSCSI card -- a small card that sits
in the Econet socket. If you have an Acorn system with one of these,
...
...
@@ -84,6 +86,7 @@ config SCSI_ECOSCSI
config SCSI_OAK1
tristate "Oak SCSI support (EXPERIMENTAL)"
depends on ARCH_ACORN && EXPERIMENTAL && SCSI
select SCSI_SPI_ATTRS
help
This enables support for the Oak SCSI card. If you have an Acorn
system with one of these, say Y. If unsure, say N.
...
...
drivers/scsi/arm/scsi.h
浏览文件 @
f8872f4c
...
...
@@ -74,7 +74,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt)
unsigned
long
len
=
0
;
int
buf
;
SCpnt
->
SCp
.
buffer
=
(
struct
scatterlist
*
)
SCpnt
->
buffer
;
SCpnt
->
SCp
.
buffer
=
(
struct
scatterlist
*
)
SCpnt
->
request_
buffer
;
SCpnt
->
SCp
.
buffers_residual
=
SCpnt
->
use_sg
-
1
;
SCpnt
->
SCp
.
ptr
=
(
char
*
)
(
page_address
(
SCpnt
->
SCp
.
buffer
->
page
)
+
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录