From: Len Brown <len.brown@intel.com>
Date: Sat, 25 Aug 2007 05:44:01 +0000 (-0400)
Subject: Pull events into release branch
X-Git-Tag: v2.6.23-rc4~16^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9;p=linux-2.6

Pull events into release branch

Conflicts:

	drivers/acpi/video.c

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

25c87f7f2a4fc3e50a7912b1c78405d454d1c4d9
diff --cc drivers/acpi/video.c
index d727d2c715,9a5cfcfd8d..6659bdd2a4
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -1781,8 -1775,7 +1781,8 @@@ static void acpi_video_bus_notify(acpi_
  	switch (event) {
  	case ACPI_VIDEO_NOTIFY_SWITCH:	/* User requested a switch,
  					 * most likely via hotkey. */
- 		acpi_bus_generate_event(device, event, 0);
+ 		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_SWITCHVIDEOMODE;
  		break;
  
  	case ACPI_VIDEO_NOTIFY_PROBE:	/* User plugged in or removed a video
@@@ -1790,24 -1783,14 +1790,24 @@@
  		acpi_video_device_enumerate(video);
  		acpi_video_device_rebind(video);
  		acpi_video_switch_output(video, event);
- 		acpi_bus_generate_event(device, event, 0);
+ 		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_SWITCHVIDEOMODE;
  		break;
  
  	case ACPI_VIDEO_NOTIFY_CYCLE:	/* Cycle Display output hotkey pressed. */
 +		acpi_video_switch_output(video, event);
- 		acpi_bus_generate_event(device, event, 0);
++		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_SWITCHVIDEOMODE;
 +		break;
  	case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT:	/* Next Display output hotkey pressed. */
 +		acpi_video_switch_output(video, event);
- 		acpi_bus_generate_event(device, event, 0);
++		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_VIDEO_NEXT;
 +		break;
  	case ACPI_VIDEO_NOTIFY_PREV_OUTPUT:	/* previous Display output hotkey pressed. */
  		acpi_video_switch_output(video, event);
- 		acpi_bus_generate_event(device, event, 0);
+ 		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_VIDEO_PREV;
  		break;
  
  	default:
@@@ -1837,37 -1811,21 +1837,37 @@@ static void acpi_video_device_notify(ac
  		return;
  
  	device = video_device->dev;
 +	bus = video_device->video;
 +	input = bus->input;
  
  	switch (event) {
 -	case ACPI_VIDEO_NOTIFY_SWITCH:	/* change in status (cycle output device) */
 -	case ACPI_VIDEO_NOTIFY_PROBE:	/* change in status (output device status) */
 +	case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:	/* Cycle brightness */
 +		acpi_video_switch_brightness(video_device, event);
- 		acpi_bus_generate_event(device, event, 0);
+ 		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_BRIGHTNESS_CYCLE;
  		break;
 -	case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:	/* Cycle brightness */
  	case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:	/* Increase brightness */
 +		acpi_video_switch_brightness(video_device, event);
- 		acpi_bus_generate_event(device, event, 0);
++		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_BRIGHTNESSUP;
 +		break;
  	case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:	/* Decrease brightness */
 +		acpi_video_switch_brightness(video_device, event);
- 		acpi_bus_generate_event(device, event, 0);
++		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_BRIGHTNESSDOWN;
 +		break;
  	case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS:	/* zero brightnesss */
 +		acpi_video_switch_brightness(video_device, event);
- 		acpi_bus_generate_event(device, event, 0);
++		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_BRIGHTNESS_ZERO;
 +		break;
  	case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:	/* display device off */
  		acpi_video_switch_brightness(video_device, event);
- 		acpi_bus_generate_event(device, event, 0);
+ 		acpi_bus_generate_proc_event(device, event, 0);
 +		keycode = KEY_DISPLAY_OFF;
  		break;
  	default:
 +		keycode = KEY_UNKNOWN;
  		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
  				  "Unsupported event [0x%x]\n", event));
  		break;