Merge branch 'upstream' into bugfix-video

Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

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

1 files changed, 0 insertions, 2 deletions

diff --git a/include/linux/serial.h b/include/linux/serial.h
index 441980ecc4e5..90e9f981358a 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -130,7 +130,6 @@ struct serial_uart_config {
 #define ASYNCB_CHECK_CD         25 /* i.e., CLOCAL */
 #define ASYNCB_SHARE_IRQ        24 /* for multifunction cards, no longer used */
 #define ASYNCB_CONS_FLOW        23 /* flow control for console  */
-#define ASYNCB_BOOT_ONLYMCA     22 /* Probe only if MCA bus */
 #define ASYNCB_FIRST_KERNEL     22
 
 #define ASYNC_HUP_NOTIFY        (1U << ASYNCB_HUP_NOTIFY)
@@ -166,7 +165,6 @@ struct serial_uart_config {
 #define ASYNC_CHECK_CD          (1U << ASYNCB_CHECK_CD)
 #define ASYNC_SHARE_IRQ         (1U << ASYNCB_SHARE_IRQ)
 #define ASYNC_CONS_FLOW         (1U << ASYNCB_CONS_FLOW)
-#define ASYNC_BOOT_ONLYMCA      (1U << ASYNCB_BOOT_ONLYMCA)
 #define ASYNC_INTERNAL_FLAGS    (~((1U << ASYNCB_FIRST_KERNEL) - 1))
 
 /*