Merge branch 'for-2.6.36' into for-2.6.37

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index 38fe59dc89ae..7f0c32908568 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -21,6 +21,8 @@ struct vt_struct;
 #define NPAR 16
 
 struct vc_data {
+        struct tty_port port;                   /* Upper level data */
+
         unsigned short  vc_num;                 /* Console number */
         unsigned int    vc_cols;                /* [#] Console size */
         unsigned int    vc_rows;
@@ -56,7 +58,6 @@ struct vc_data {
         /* VT terminal data */
         unsigned int    vc_state;               /* Escape sequence parser state */
         unsigned int    vc_npar,vc_par[NPAR];   /* Parameters of current escape sequence */
-        struct tty_struct *vc_tty;              /* TTY we are attached to */
         /* data for manual vt switching */
         struct vt_mode  vt_mode;
         struct pid      *vt_pid;
@@ -105,6 +106,7 @@ struct vc_data {
         struct vc_data **vc_display_fg;         /* [!] Ptr to var holding fg console for this display */
         unsigned long   vc_uni_pagedir;
         unsigned long   *vc_uni_pagedir_loc;  /* [!] Location of uni_pagedir variable for this console */
+        bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */
         /* additional information is in vt_kern.h */
 };