Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
95e3f66f
Commit
95e3f66f
authored
Sep 17, 2007
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Pull misc into release branch
parents
5e41d0d6
66baf327
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
drivers/acpi/event.c
drivers/acpi/event.c
+1
-1
drivers/acpi/sleep/proc.c
drivers/acpi/sleep/proc.c
+5
-5
drivers/misc/msi-laptop.c
drivers/misc/msi-laptop.c
+1
-1
No files found.
drivers/acpi/event.c
View file @
95e3f66f
...
@@ -240,7 +240,7 @@ int acpi_bus_generate_netlink_event(const char *device_class,
...
@@ -240,7 +240,7 @@ int acpi_bus_generate_netlink_event(const char *device_class,
return
0
;
return
0
;
}
}
EXPORT_SYMBOL
(
acpi_generate_netlink_event
);
EXPORT_SYMBOL
(
acpi_
bus_
generate_netlink_event
);
static
int
acpi_event_genetlink_init
(
void
)
static
int
acpi_event_genetlink_init
(
void
)
{
{
...
...
drivers/acpi/sleep/proc.c
View file @
95e3f66f
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
*/
*/
ACPI_MODULE_NAME
(
"sleep"
)
ACPI_MODULE_NAME
(
"sleep"
)
#ifdef CONFIG_ACPI_PROCFS
_SLEEP
#ifdef CONFIG_ACPI_PROCFS
static
int
acpi_system_sleep_seq_show
(
struct
seq_file
*
seq
,
void
*
offset
)
static
int
acpi_system_sleep_seq_show
(
struct
seq_file
*
seq
,
void
*
offset
)
{
{
int
i
;
int
i
;
...
@@ -76,7 +76,7 @@ acpi_system_write_sleep(struct file *file,
...
@@ -76,7 +76,7 @@ acpi_system_write_sleep(struct file *file,
Done:
Done:
return
error
?
error
:
count
;
return
error
?
error
:
count
;
}
}
#endif
/* CONFIG_ACPI_PROCFS
_SLEEP
*/
#endif
/* CONFIG_ACPI_PROCFS */
#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86)
#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86)
/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
...
@@ -471,7 +471,7 @@ static const struct file_operations acpi_system_wakeup_device_fops = {
...
@@ -471,7 +471,7 @@ static const struct file_operations acpi_system_wakeup_device_fops = {
.
release
=
single_release
,
.
release
=
single_release
,
};
};
#ifdef CONFIG_ACPI_PROCFS
_SLEEP
#ifdef CONFIG_ACPI_PROCFS
static
const
struct
file_operations
acpi_system_sleep_fops
=
{
static
const
struct
file_operations
acpi_system_sleep_fops
=
{
.
open
=
acpi_system_sleep_open_fs
,
.
open
=
acpi_system_sleep_open_fs
,
.
read
=
seq_read
,
.
read
=
seq_read
,
...
@@ -479,7 +479,7 @@ static const struct file_operations acpi_system_sleep_fops = {
...
@@ -479,7 +479,7 @@ static const struct file_operations acpi_system_sleep_fops = {
.
llseek
=
seq_lseek
,
.
llseek
=
seq_lseek
,
.
release
=
single_release
,
.
release
=
single_release
,
};
};
#endif
/* CONFIG_ACPI_PROCFS
_SLEEP
*/
#endif
/* CONFIG_ACPI_PROCFS */
#ifdef HAVE_ACPI_LEGACY_ALARM
#ifdef HAVE_ACPI_LEGACY_ALARM
static
const
struct
file_operations
acpi_system_alarm_fops
=
{
static
const
struct
file_operations
acpi_system_alarm_fops
=
{
...
@@ -506,7 +506,7 @@ static int __init acpi_sleep_proc_init(void)
...
@@ -506,7 +506,7 @@ static int __init acpi_sleep_proc_init(void)
if
(
acpi_disabled
)
if
(
acpi_disabled
)
return
0
;
return
0
;
#ifdef CONFIG_ACPI_PROCFS
_SLEEP
#ifdef CONFIG_ACPI_PROCFS
/* 'sleep' [R/W] */
/* 'sleep' [R/W] */
entry
=
entry
=
create_proc_entry
(
"sleep"
,
S_IFREG
|
S_IRUGO
|
S_IWUSR
,
create_proc_entry
(
"sleep"
,
S_IFREG
|
S_IRUGO
|
S_IWUSR
,
...
...
drivers/misc/msi-laptop.c
View file @
95e3f66f
...
@@ -353,7 +353,7 @@ static int __init msi_init(void)
...
@@ -353,7 +353,7 @@ static int __init msi_init(void)
if
(
IS_ERR
(
msibl_device
))
if
(
IS_ERR
(
msibl_device
))
return
PTR_ERR
(
msibl_device
);
return
PTR_ERR
(
msibl_device
);
msibl_device
->
props
.
max_brightness
=
MSI_LCD_LEVEL_MAX
-
1
,
msibl_device
->
props
.
max_brightness
=
MSI_LCD_LEVEL_MAX
-
1
;
ret
=
platform_driver_register
(
&
msipf_driver
);
ret
=
platform_driver_register
(
&
msipf_driver
);
if
(
ret
)
if
(
ret
)
...
...
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