From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 24 Feb 2011 19:36:31 +0000 (-0800)
Subject: Merge 2.6.38-rc6 into tty-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f227e08b71b9c273eaa29a57370a3a5b833aa382;p=linux-beck.git

Merge 2.6.38-rc6 into tty-next

This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

f227e08b71b9c273eaa29a57370a3a5b833aa382
diff --cc drivers/char/Makefile
index 3ca1f627be8a,8238f89f73c9..057f65452e7b
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -5,7 -5,32 +5,8 @@@
  obj-y				+= mem.o random.o
  obj-$(CONFIG_TTY_PRINTK)	+= ttyprintk.o
  obj-y				+= misc.o
 -obj-$(CONFIG_BFIN_JTAG_COMM)	+= bfin_jtag_comm.o
 -obj-$(CONFIG_MVME147_SCC)	+= generic_serial.o vme_scc.o
 -obj-$(CONFIG_MVME162_SCC)	+= generic_serial.o vme_scc.o
 -obj-$(CONFIG_BVME6000_SCC)	+= generic_serial.o vme_scc.o
 -obj-$(CONFIG_ROCKETPORT)	+= rocket.o
 -obj-$(CONFIG_SERIAL167)		+= serial167.o
 -obj-$(CONFIG_CYCLADES)		+= cyclades.o
 -obj-$(CONFIG_STALLION)		+= stallion.o
 -obj-$(CONFIG_ISTALLION)		+= istallion.o
 -obj-$(CONFIG_NOZOMI)		+= nozomi.o
 -obj-$(CONFIG_DIGIEPCA)		+= epca.o
 -obj-$(CONFIG_SPECIALIX)		+= specialix.o
 -obj-$(CONFIG_MOXA_INTELLIO)	+= moxa.o
 -obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o
  obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o
 -obj-$(CONFIG_MOXA_SMARTIO)	+= mxser.o
 -obj-$(CONFIG_COMPUTONE)		+= ip2/
 -obj-$(CONFIG_RISCOM8)		+= riscom8.o
 -obj-$(CONFIG_ISI)		+= isicom.o
 -obj-$(CONFIG_SYNCLINK)		+= synclink.o
 -obj-$(CONFIG_SYNCLINKMP)	+= synclinkmp.o
 -obj-$(CONFIG_SYNCLINK_GT)	+= synclink_gt.o
 -obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 -obj-$(CONFIG_SX)		+= sx.o generic_serial.o
 -obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
+ obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o
  obj-$(CONFIG_RAW_DRIVER)	+= raw.o
  obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
  obj-$(CONFIG_MSPEC)		+= mspec.o
diff --cc drivers/tty/hvc/Makefile
index 7b0edbce9009,d79e7e9bf9d2..40a25d93fe52
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@@ -9,6 -9,4 +9,5 @@@ obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.
  obj-$(CONFIG_HVC_XEN)		+= hvc_xen.o
  obj-$(CONFIG_HVC_IUCV)		+= hvc_iucv.o
  obj-$(CONFIG_HVC_UDBG)		+= hvc_udbg.o
 +obj-$(CONFIG_HVC_BFIN_JTAG)	+= hvc_bfin_jtag.o
  obj-$(CONFIG_HVCS)		+= hvcs.o
- obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o
diff --cc drivers/tty/serial/68328serial.c
index 1de0e8d4bde1,de0160e3f8c4..d5bfd41707e7
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@@ -945,10 -967,9 +945,9 @@@ static void send_break(struct m68k_seri
          local_irq_restore(flags);
  }
  
 -static int rs_ioctl(struct tty_struct *tty, struct file * file,
 +static int rs_ioctl(struct tty_struct *tty,
  		    unsigned int cmd, unsigned long arg)
  {
- 	int error;
  	struct m68k_serial * info = (struct m68k_serial *)tty->driver_data;
  	int retval;