Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
759979ab
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
759979ab
编写于
11月 10, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
上级
3ae0af12
a2932b35
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
12 addition
and
26 deletion
+12
-26
drivers/pcmcia/Kconfig
drivers/pcmcia/Kconfig
+1
-1
drivers/pcmcia/Makefile
drivers/pcmcia/Makefile
+3
-3
drivers/pcmcia/au1000_db1x00.c
drivers/pcmcia/au1000_db1x00.c
+1
-0
drivers/pcmcia/au1000_generic.h
drivers/pcmcia/au1000_generic.h
+2
-0
drivers/pcmcia/au1000_pb1x00.c
drivers/pcmcia/au1000_pb1x00.c
+1
-0
drivers/pcmcia/au1000_xxs1500.c
drivers/pcmcia/au1000_xxs1500.c
+0
-1
drivers/pcmcia/i82365.c
drivers/pcmcia/i82365.c
+1
-0
drivers/pcmcia/m8xx_pcmcia.c
drivers/pcmcia/m8xx_pcmcia.c
+3
-21
未找到文件。
drivers/pcmcia/Kconfig
浏览文件 @
759979ab
...
...
@@ -156,7 +156,7 @@ config TCIC
config PCMCIA_M8XX
tristate "MPC8xx PCMCIA support"
depends on PCMCIA && PPC
depends on PCMCIA && PPC
&& 8xx
select PCCARD_NONSTATIC
help
Say Y here to include support for PowerPC 8xx series PCMCIA
...
...
drivers/pcmcia/Makefile
浏览文件 @
759979ab
...
...
@@ -25,7 +25,7 @@ obj-$(CONFIG_PD6729) += pd6729.o
obj-$(CONFIG_I82365)
+=
i82365.o
obj-$(CONFIG_I82092)
+=
i82092.o
obj-$(CONFIG_TCIC)
+=
tcic.o
obj-$(CONFIG_PCMCIA_M8XX)
+=
m8xx_pcmcia.o
obj-$(CONFIG_PCMCIA_M8XX)
+=
m8xx_pcmcia.o
obj-$(CONFIG_HD64465_PCMCIA)
+=
hd64465_ss.o
obj-$(CONFIG_PCMCIA_SA1100)
+=
sa11xx_core.o sa1100_cs.o
obj-$(CONFIG_PCMCIA_SA1111)
+=
sa11xx_core.o sa1111_cs.o
...
...
@@ -47,10 +47,10 @@ au1x00_ss-$(CONFIG_MIPS_PB1200) += au1000_db1x00.o
au1x00_ss-$(CONFIG_MIPS_PB1500)
+=
au1000_pb1x00.o
au1x00_ss-$(CONFIG_MIPS_DB1000)
+=
au1000_db1x00.o
au1x00_ss-$(CONFIG_MIPS_DB1100)
+=
au1000_db1x00.o
au1x00_ss-$(CONFIG_MIPS_DB1200)
+=
au1000_db1x00.o
au1x00_ss-$(CONFIG_MIPS_DB1200)
+=
au1000_db1x00.o
au1x00_ss-$(CONFIG_MIPS_DB1500)
+=
au1000_db1x00.o
au1x00_ss-$(CONFIG_MIPS_DB1550)
+=
au1000_db1x00.o
au1x00_ss-$(CONFIG_MIPS_XXS1500)
+=
au1000_xxs1500.o
au1x00_ss-$(CONFIG_MIPS_XXS1500)
+=
au1000_xxs1500.o
sa1111_cs-y
+=
sa1111_generic.o
sa1111_cs-$(CONFIG_ASSABET_NEPONSET)
+=
sa1100_neponset.o
...
...
drivers/pcmcia/au1000_db1x00.c
浏览文件 @
759979ab
...
...
@@ -30,6 +30,7 @@
*
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
...
...
drivers/pcmcia/au1000_generic.h
浏览文件 @
759979ab
...
...
@@ -22,6 +22,8 @@
#define __ASM_AU1000_PCMCIA_H
/* include the world */
#include <linux/config.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
...
...
drivers/pcmcia/au1000_pb1x00.c
浏览文件 @
759979ab
...
...
@@ -21,6 +21,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
...
...
drivers/pcmcia/au1000_xxs1500.c
浏览文件 @
759979ab
...
...
@@ -27,7 +27,6 @@
*/
#include <linux/module.h>
#include <linux/init.h>
#include <linux/config.h>
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
...
...
drivers/pcmcia/i82365.c
浏览文件 @
759979ab
...
...
@@ -1366,6 +1366,7 @@ static int __init init_i82365(void)
if
(
sockets
==
0
)
{
printk
(
"not found.
\n
"
);
platform_device_unregister
(
&
i82365_device
);
release_region
(
i365_base
,
2
);
driver_unregister
(
&
i82365_driver
);
return
-
ENODEV
;
}
...
...
drivers/pcmcia/m8xx_pcmcia.c
浏览文件 @
759979ab
...
...
@@ -39,7 +39,6 @@
#include <asm/io.h>
#include <asm/bitops.h>
#include <asm/segment.h>
#include <asm/system.h>
#include <linux/kernel.h>
...
...
@@ -50,6 +49,7 @@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <asm/mpc8xx.h>
#include <asm/8xx_immap.h>
...
...
@@ -546,29 +546,11 @@ static void m8xx_shutdown(void)
free_irq
(
pcmcia_schlvl
,
NULL
);
}
/* copied from tcic.c */
static
int
m8xx_drv_suspend
(
struct
device
*
dev
,
pm_message_t
state
,
u32
level
)
{
int
ret
=
0
;
if
(
level
==
SUSPEND_SAVE_STATE
)
ret
=
pcmcia_socket_dev_suspend
(
dev
,
state
);
return
ret
;
}
static
int
m8xx_drv_resume
(
struct
device
*
dev
,
u32
level
)
{
int
ret
=
0
;
if
(
level
==
RESUME_RESTORE_STATE
)
ret
=
pcmcia_socket_dev_resume
(
dev
);
return
ret
;
}
static
struct
device_driver
m8xx_driver
=
{
.
name
=
"m8xx-pcmcia"
,
.
bus
=
&
platform_bus_type
,
.
suspend
=
m8xx_dr
v_suspend
,
.
resume
=
m8xx_dr
v_resume
,
.
suspend
=
pcmcia_socket_de
v_suspend
,
.
resume
=
pcmcia_socket_de
v_resume
,
};
static
struct
platform_device
m8xx_device
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录