From: Len Brown <len.brown@intel.com>
Date: Fri, 16 Feb 2007 23:52:41 +0000 (-0500)
Subject: Pull misc-for-upstream into release branch
X-Git-Tag: v2.6.21-rc1~92
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81450b73dde07f473a4a7208b209b4c8b7251d90;p=linux-2.6

Pull misc-for-upstream into release branch

Conflicts:

	drivers/usb/misc/appledisplay.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

81450b73dde07f473a4a7208b209b4c8b7251d90
diff --cc drivers/acpi/processor_idle.c
index 8206fc1ecc,59fac8d794..835595ae06
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@ -39,18 -39,15 +39,26 @@@
  #include <linux/moduleparam.h>
  #include <linux/sched.h>	/* need_resched() */
  #include <linux/latency.h>
 +#include <linux/clockchips.h>
 +
 +/*
 + * Include the apic definitions for x86 to have the APIC timer related defines
 + * available also for UP (on SMP it gets magically included via linux/smp.h).
 + * asm/acpi.h is not an option, as it would require more include magic. Also
 + * creating an empty asm-ia64/apic.h would just trade pest vs. cholera.
 + */
 +#ifdef CONFIG_X86
 +#include <asm/apic.h>
 +#endif
  
+ /*
+  * Include the apic definitions for x86 to have the APIC timer related defines
+  * available also for UP (on SMP it gets magically included via linux/smp.h).
+  */
+ #ifdef CONFIG_X86
+ #include <asm/apic.h>
+ #endif
+ 
  #include <asm/io.h>
  #include <asm/uaccess.h>
  
diff --cc drivers/usb/misc/appledisplay.c
index 32f0e3a5b0,31ab83cc95..e573c8ba97
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@@ -281,8 -281,8 +281,8 @@@ static int appledisplay_probe(struct us
  	/* Register backlight device */
  	snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
  		atomic_inc_return(&count_displays) - 1);
- 	pdata->bd = backlight_device_register(bl_name, NULL,
- 		pdata, &appledisplay_bl_data);
 -	pdata->bd = backlight_device_register(bl_name, NULL, pdata
++	pdata->bd = backlight_device_register(bl_name, NULL, pdata,
+ 						&appledisplay_bl_data);
  	if (IS_ERR(pdata->bd)) {
  		err("appledisplay: Backlight registration failed");
  		goto error;