Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
1b958a3e
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
1b958a3e
编写于
3月 16, 2009
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'misc-up-now' and 'platform-drivers' into release
上级
27ce3419
da511997
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
21 addition
and
16 deletion
+21
-16
drivers/platform/x86/Kconfig
drivers/platform/x86/Kconfig
+6
-8
drivers/platform/x86/acer-wmi.c
drivers/platform/x86/acer-wmi.c
+1
-1
drivers/platform/x86/asus-laptop.c
drivers/platform/x86/asus-laptop.c
+4
-1
drivers/platform/x86/eeepc-laptop.c
drivers/platform/x86/eeepc-laptop.c
+5
-1
drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/thinkpad_acpi.c
+4
-4
drivers/platform/x86/wmi.c
drivers/platform/x86/wmi.c
+1
-1
未找到文件。
drivers/platform/x86/Kconfig
浏览文件 @
1b958a3e
...
...
@@ -15,8 +15,7 @@ menuconfig X86_PLATFORM_DEVICES
if X86_PLATFORM_DEVICES
config ACER_WMI
tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Acer WMI Laptop Extras"
depends on ACPI
depends on LEDS_CLASS
depends on NEW_LEDS
...
...
@@ -39,9 +38,9 @@ config ASUS_LAPTOP
tristate "Asus Laptop Extras (EXPERIMENTAL)"
depends on ACPI
depends on EXPERIMENTAL && !ACPI_ASUS
depends on
LEDS_CLASS
depends on
NEW_LEDS
depends on
BACKLIGHT_CLASS_DEVICE
select
LEDS_CLASS
select
NEW_LEDS
select
BACKLIGHT_CLASS_DEVICE
depends on INPUT
---help---
This is the new Linux driver for Asus laptops. It may also support some
...
...
@@ -185,11 +184,11 @@ config SONYPI_COMPAT
config THINKPAD_ACPI
tristate "ThinkPad ACPI Laptop Extras"
depends on ACPI
depends on INPUT
select BACKLIGHT_LCD_SUPPORT
select BACKLIGHT_CLASS_DEVICE
select HWMON
select NVRAM
select INPUT
select NEW_LEDS
select LEDS_CLASS
select NET
...
...
@@ -315,9 +314,8 @@ config EEEPC_LAPTOP
config ACPI_WMI
tristate "WMI
(EXPERIMENTAL)
"
tristate "WMI"
depends on ACPI
depends on EXPERIMENTAL
help
This driver adds support for the ACPI-WMI (Windows Management
Instrumentation) mapper device (PNP0C14) found on some systems.
...
...
drivers/platform/x86/acer-wmi.c
浏览文件 @
1b958a3e
...
...
@@ -1026,7 +1026,7 @@ static void acer_rfkill_exit(void)
kfree
(
wireless_rfkill
->
data
);
rfkill_unregister
(
wireless_rfkill
);
if
(
has_cap
(
ACER_CAP_BLUETOOTH
))
{
kfree
(
wireless
_rfkill
->
data
);
kfree
(
bluetooth
_rfkill
->
data
);
rfkill_unregister
(
bluetooth_rfkill
);
}
return
;
...
...
drivers/platform/x86/asus-laptop.c
浏览文件 @
1b958a3e
...
...
@@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)
static
void
asus_hotk_notify
(
acpi_handle
handle
,
u32
event
,
void
*
data
)
{
static
struct
key_entry
*
key
;
u16
count
;
/* TODO Find a better way to handle events count. */
if
(
!
hotk
)
...
...
@@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
lcd_blank
(
FB_BLANK_POWERDOWN
);
}
count
=
hotk
->
event_count
[
event
%
128
]
++
;
acpi_bus_generate_proc_event
(
hotk
->
device
,
event
,
count
);
acpi_bus_generate_netlink_event
(
hotk
->
device
->
pnp
.
device_class
,
dev_name
(
&
hotk
->
device
->
dev
),
event
,
hotk
->
event_count
[
event
%
128
]
++
);
count
);
if
(
hotk
->
inputdev
)
{
key
=
asus_get_entry_by_scancode
(
event
);
...
...
drivers/platform/x86/eeepc-laptop.c
浏览文件 @
1b958a3e
...
...
@@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
static
void
eeepc_hotk_notify
(
acpi_handle
handle
,
u32
event
,
void
*
data
)
{
static
struct
key_entry
*
key
;
u16
count
;
if
(
!
ehotk
)
return
;
if
(
event
>=
NOTIFY_BRN_MIN
&&
event
<=
NOTIFY_BRN_MAX
)
notify_brn
();
count
=
ehotk
->
event_count
[
event
%
128
]
++
;
acpi_bus_generate_proc_event
(
ehotk
->
device
,
event
,
count
);
acpi_bus_generate_netlink_event
(
ehotk
->
device
->
pnp
.
device_class
,
dev_name
(
&
ehotk
->
device
->
dev
),
event
,
ehotk
->
event_count
[
event
%
128
]
++
);
count
);
if
(
ehotk
->
inputdev
)
{
key
=
eepc_get_entry_by_scancode
(
event
);
if
(
key
)
{
...
...
drivers/platform/x86/thinkpad_acpi.c
浏览文件 @
1b958a3e
...
...
@@ -7532,7 +7532,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
* if it is not there yet.
*/
#define IBM_BIOS_MODULE_ALIAS(__type) \
MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")
MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW
*
")
/* Non-ancient thinkpads */
MODULE_ALIAS
(
"dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"
);
...
...
@@ -7541,9 +7541,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
/* Ancient thinkpad BIOSes have to be identified by
* BIOS type or model number, and there are far less
* BIOS types than model numbers... */
IBM_BIOS_MODULE_ALIAS
(
"I[B
,D,H,I,M,N,O,T,W,V,Y,
Z]"
);
IBM_BIOS_MODULE_ALIAS
(
"1[0
,3,6,8,A-G,I,K,M-P,S,
T]"
);
IBM_BIOS_MODULE_ALIAS
(
"K[U
,
X-Z]"
);
IBM_BIOS_MODULE_ALIAS
(
"I[B
DHIMNOTWVY
Z]"
);
IBM_BIOS_MODULE_ALIAS
(
"1[0
368A-GIKM-PS
T]"
);
IBM_BIOS_MODULE_ALIAS
(
"K[UX-Z]"
);
MODULE_AUTHOR
(
"Borislav Deianov, Henrique de Moraes Holschuh"
);
MODULE_DESCRIPTION
(
TPACPI_DESC
);
...
...
drivers/platform/x86/wmi.c
浏览文件 @
1b958a3e
...
...
@@ -708,7 +708,7 @@ static int __init acpi_wmi_add(struct acpi_device *device)
static
int
__init
acpi_wmi_init
(
void
)
{
acpi_status
result
;
int
result
;
INIT_LIST_HEAD
(
&
wmi_blocks
.
list
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录