git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
char
/
sonypi.c
diff --git
a/drivers/char/sonypi.c
b/drivers/char/sonypi.c
index
d4e434d
..
a90f5d9
100644
(file)
--- a/
drivers/char/sonypi.c
+++ b/
drivers/char/sonypi.c
@@
-33,6
+33,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/input.h>
#include <linux/pci.h>
#include <linux/module.h>
#include <linux/input.h>
#include <linux/pci.h>
@@
-511,7
+512,7
@@
static struct sonypi_device {
#ifdef CONFIG_ACPI
static struct acpi_device *sonypi_acpi_device;
#ifdef CONFIG_ACPI
static struct acpi_device *sonypi_acpi_device;
-static int acpi_
driver_register
ed;
+static int acpi_
enabl
ed;
#endif
static int sonypi_ec_write(u8 addr, u8 value)
#endif
static int sonypi_ec_write(u8 addr, u8 value)
@@
-868,7
+869,7
@@
found:
sonypi_report_input_event(event);
#ifdef CONFIG_ACPI
sonypi_report_input_event(event);
#ifdef CONFIG_ACPI
- if (
sonypi_acpi_device
)
+ if (
acpi_enabled
)
acpi_bus_generate_event(sonypi_acpi_device, 1, event);
#endif
acpi_bus_generate_event(sonypi_acpi_device, 1, event);
#endif
@@
-1106,7
+1107,7
@@
static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,
return ret;
}
return ret;
}
-static
const
struct file_operations sonypi_misc_fops = {
+static struct file_operations sonypi_misc_fops = {
.owner = THIS_MODULE,
.read = sonypi_misc_read,
.poll = sonypi_misc_poll,
.owner = THIS_MODULE,
.read = sonypi_misc_read,
.poll = sonypi_misc_poll,
@@
-1282,7
+1283,7
@@
static int __devinit sonypi_setup_irq(struct sonypi_device *dev,
while (irq_list->irq) {
if (!request_irq(irq_list->irq, sonypi_irq,
while (irq_list->irq) {
if (!request_irq(irq_list->irq, sonypi_irq,
-
IRQF_SHARED
, "sonypi", sonypi_irq)) {
+
SA_SHIRQ
, "sonypi", sonypi_irq)) {
dev->irq = irq_list->irq;
dev->bits = irq_list->bits;
return 0;
dev->irq = irq_list->irq;
dev->bits = irq_list->bits;
return 0;
@@
-1550,8
+1551,8
@@
static int __init sonypi_init(void)
goto err_free_device;
#ifdef CONFIG_ACPI
goto err_free_device;
#ifdef CONFIG_ACPI
- if (acpi_bus_register_driver(&sonypi_acpi_driver) >
=
0)
- acpi_
driver_register
ed = 1;
+ if (acpi_bus_register_driver(&sonypi_acpi_driver) > 0)
+ acpi_
enabl
ed = 1;
#endif
return 0;
#endif
return 0;
@@
-1566,7
+1567,7
@@
static int __init sonypi_init(void)
static void __exit sonypi_exit(void)
{
#ifdef CONFIG_ACPI
static void __exit sonypi_exit(void)
{
#ifdef CONFIG_ACPI
- if (acpi_
driver_register
ed)
+ if (acpi_
enabl
ed)
acpi_bus_unregister_driver(&sonypi_acpi_driver);
#endif
platform_device_unregister(sonypi_platform_device);
acpi_bus_unregister_driver(&sonypi_acpi_driver);
#endif
platform_device_unregister(sonypi_platform_device);