From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 4 Jul 2006 04:32:50 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v2.6.18-rc1~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e82ca04387dd6c98722f5f48235089839fd04268;hp=-c

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

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (44 commits)
  ACPI: remove function tracing macros from drivers/acpi/*.c
  ACPI: add support for Smart Battery
  ACPI: handle battery notify event on broken BIOS
  ACPI: handle AC notify event on broken BIOS
  ACPI: asus_acpi: add S1N WLED control
  ACPI: asus_acpi: correct M6N/M6R display nodes
  ACPI: asus_acpi: add S1N WLED control
  ACPI: asus_acpi: rework model detection
  ACPI: asus_acpi: support L5D
  ACPI: asus_acpi: handle internal Bluetooth / support W5A
  ACPI: asus_acpi: support A4G
  ACPI: asus_acpi: support W3400N
  ACPI: asus_acpi: LED display support
  ACPI: asus_acpi: support A3G
  ACPI: asus_acpi: misc cleanups
  ACPI: video: Remove unneeded acpi_handle from driver.
  ACPI: thermal: Remove unneeded acpi_handle from driver.
  ACPI: power: Remove unneeded acpi_handle from driver.
  ACPI: pci_root: Remove unneeded acpi_handle from driver.
  ACPI: pci_link: Remove unneeded acpi_handle from driver.
  ...
---

e82ca04387dd6c98722f5f48235089839fd04268
diff --combined drivers/acpi/osl.c
index 5a468e2779ae,d4bd314d60ba..eedb05c6dc7b
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@ -146,13 -146,6 +146,6 @@@ void *acpi_os_allocate(acpi_size size
  		return kmalloc(size, GFP_KERNEL);
  }
  
- void acpi_os_free(void *ptr)
- {
- 	kfree(ptr);
- }
- 
- EXPORT_SYMBOL(acpi_os_free);
- 
  acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
  {
  	if (efi_enabled) {
@@@ -280,7 -273,7 +273,7 @@@ acpi_os_install_interrupt_handler(u32 g
  
  	acpi_irq_handler = handler;
  	acpi_irq_context = context;
 -	if (request_irq(irq, acpi_irq, SA_SHIRQ, "acpi", acpi_irq)) {
 +	if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {
  		printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
  		return AE_NOT_ACQUIRED;
  	}
@@@ -742,7 -735,7 +735,7 @@@ acpi_status acpi_os_delete_semaphore(ac
  
  	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle));
  
- 	acpi_os_free(sem);
+ 	kfree(sem);
  	sem = NULL;
  
  	return AE_OK;