From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 10 Jan 2006 17:00:55 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: tegra-9.12.3~24394
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=d936cfc72032fb4af03d1edd99596d18ea1f081c;hp=-c

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
---

d936cfc72032fb4af03d1edd99596d18ea1f081c
diff --combined drivers/char/vr41xx_rtc.c
index 159acd8b778,5354537587e..bc1b4a15212
--- a/drivers/char/vr41xx_rtc.c
+++ b/drivers/char/vr41xx_rtc.c
@@@ -1,7 -1,7 +1,7 @@@
  /*
   *  Driver for NEC VR4100 series  Real Time Clock unit.
   *
-  *  Copyright (C) 2003-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+  *  Copyright (C) 2003-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
   *
   *  This program is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
@@@ -37,7 -37,7 +37,7 @@@
  #include <asm/uaccess.h>
  #include <asm/vr41xx/vr41xx.h>
  
- MODULE_AUTHOR("Yoichi Yuasa <yuasa@hh.iij4u.or.jp>");
+ MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
  MODULE_DESCRIPTION("NEC VR4100 series RTC driver");
  MODULE_LICENSE("GPL");
  
@@@ -127,6 -127,8 +127,6 @@@ struct resource rtc_resource[2] = 
  		.flags	= IORESOURCE_MEM,	},
  };
  
 -#define RTC_NUM_RESOURCES	sizeof(rtc_resource) / sizeof(struct resource)
 -
  static inline unsigned long read_elapsed_second(void)
  {
  	unsigned long first_low, first_mid, first_high;
@@@ -684,8 -686,7 +684,8 @@@ static int __devinit vr41xx_rtc_init(vo
  		break;
  	}
  
 -	rtc_platform_device = platform_device_register_simple("RTC", -1, rtc_resource, RTC_NUM_RESOURCES);
 +	rtc_platform_device = platform_device_register_simple("RTC", -1,
 +			      rtc_resource, ARRAY_SIZE(rtc_resource));
  	if (IS_ERR(rtc_platform_device))
  		return PTR_ERR(rtc_platform_device);
  
diff --combined drivers/serial/vr41xx_siu.c
index 0a28deeb098,4a3005fdd01..d61494d185c
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@@ -1,7 -1,7 +1,7 @@@
  /*
   *  Driver for NEC VR4100 series Serial Interface Unit.
   *
-  *  Copyright (C) 2004-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+  *  Copyright (C) 2004-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
   *
   *  Based on drivers/serial/8250.c, by Russell King.
   *
@@@ -371,6 -371,11 +371,6 @@@ static inline void receive_chars(struc
  	lsr = *status;
  
  	do {
 -		if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
 -			if (tty->low_latency)
 -				tty_flip_buffer_push(tty);
 -		}
 -
  		ch = siu_read(port, UART_RX);
  		port->icount.rx++;
  		flag = TTY_NORMAL;