leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

Browse Source 
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: asus_acpi: new MAINTAINER
  ACPI: fix section mis-match build warning
  ACPI: increase ACPI_MAX_REFERENCE_COUNT for larger systems
  ACPI: EC: move verbose printk to debug build only
  backlight: fix backlight_device_register compile failures
This commit is contained in:
Linus Torvalds 2007-01-04 08:55:57 -08:00
commit d1398a6ff5
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -532,13 +532,13 @@ L: netdev@vger.kernel.org
S: Maintained S: Maintained
ASUS ACPI EXTRAS DRIVER ASUS ACPI EXTRAS DRIVER
P: Corentin Chary
M: corentincj@iksaif.net
P: Karol Kozimor P: Karol Kozimor
M: sziwan@users.sourceforge.net M: sziwan@users.sourceforge.net
P: Julien Lerouge
M: julien.lerouge@free.fr
L: acpi4asus-user@lists.sourceforge.net L: acpi4asus-user@lists.sourceforge.net
W: http://sourceforge.net/projects/acpi4asus W: http://sourceforge.net/projects/acpi4asus
W: http://julien.lerouge.free.fr W: http://xf.iksaif.net/acpi4asus
S: Maintained S: Maintained
ATA OVER ETHERNET DRIVER ATA OVER ETHERNET DRIVER

2
arch/i386/kernel/acpi/boot.c
View File

@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
/* /*
* Parse Interrupt Source Override for the ACPI SCI * Parse Interrupt Source Override for the ACPI SCI
*/ */
static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
{ {
if (trigger == 0) /* compatible SCI trigger is level */ if (trigger == 0) /* compatible SCI trigger is level */
trigger = 3; trigger = 3;

2
drivers/acpi/ec.c
View File

@ -424,7 +424,7 @@ static void acpi_ec_gpe_query(void *ec_cxt)
snprintf(object_name, 8, "_Q%2.2X", value); snprintf(object_name, 8, "_Q%2.2X", value);
printk(KERN_INFO PREFIX "evaluating %s\n", object_name); ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name));
acpi_evaluate_object(ec->handle, object_name, NULL, NULL); acpi_evaluate_object(ec->handle, object_name, NULL, NULL);
} }

2
drivers/video/backlight/corgi_bl.c
View File

@ -121,7 +121,7 @@ static int corgibl_probe(struct platform_device *pdev)
machinfo->limit_mask = -1; machinfo->limit_mask = -1;
corgi_backlight_device = backlight_device_register ("corgi-bl", corgi_backlight_device = backlight_device_register ("corgi-bl",
NULL, &corgibl_data); &pdev->dev, NULL, &corgibl_data);
if (IS_ERR (corgi_backlight_device)) if (IS_ERR (corgi_backlight_device))
return PTR_ERR (corgi_backlight_device); return PTR_ERR (corgi_backlight_device);

2
drivers/video/backlight/hp680_bl.c
View File

@ -105,7 +105,7 @@ static struct backlight_properties hp680bl_data = {
static int __init hp680bl_probe(struct platform_device *dev) static int __init hp680bl_probe(struct platform_device *dev)
{ {
hp680_backlight_device = backlight_device_register ("hp680-bl", hp680_backlight_device = backlight_device_register ("hp680-bl",
NULL, &hp680bl_data); &dev->dev, NULL, &hp680bl_data);
if (IS_ERR (hp680_backlight_device)) if (IS_ERR (hp680_backlight_device))
return PTR_ERR (hp680_backlight_device); return PTR_ERR (hp680_backlight_device);

2
drivers/video/backlight/locomolcd.c
View File

@ -184,7 +184,7 @@ static int locomolcd_probe(struct locomo_dev *ldev)
local_irq_restore(flags); local_irq_restore(flags);
locomolcd_bl_device = backlight_device_register("locomo-bl", NULL, &locomobl_data); locomolcd_bl_device = backlight_device_register("locomo-bl", &ldev->dev, NULL, &locomobl_data);
if (IS_ERR (locomolcd_bl_device)) if (IS_ERR (locomolcd_bl_device))
return PTR_ERR (locomolcd_bl_device); return PTR_ERR (locomolcd_bl_device);

2
include/acpi/acconfig.h
View File

@ -105,7 +105,7 @@
/* Maximum object reference count (detects object deletion issues) */ /* Maximum object reference count (detects object deletion issues) */
#define ACPI_MAX_REFERENCE_COUNT 0x800 #define ACPI_MAX_REFERENCE_COUNT 0x1000
/* Size of cached memory mapping for system memory operation region */ /* Size of cached memory mapping for system memory operation region */