linux-mips
[Top] [All Lists]

[PATCH 3/6] Remove bogus blank lines - sync with Linus' tree

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 3/6] Remove bogus blank lines - sync with Linus' tree
From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 20 Mar 2006 04:35:55 +0000
Cc: linux-mips@linux-mips.org, akpm@osdl.org
In-reply-to: <20060320043445.GA20171@deprecation.cyrius.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20060320043445.GA20171@deprecation.cyrius.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.11+cvs20060126
This brings video/au1100fb.c and mach-au1x00/au1xxx_ide.h in sync
with Linus' tree by removing two blank lines.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>


--- mips.git/drivers/video/au1100fb.c   2006-03-05 18:51:17.000000000 +0000
+++ linux-2.6/drivers/video/au1100fb.c  2006-03-05 19:35:05.000000000 +0000
@@ -38,7 +38,6 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
--- mips.git/include/asm-mips/mach-au1x00/au1xxx_ide.h  2006-03-13 
18:43:52.000000000 +0000
+++ linux-2.6/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-03-05 
19:35:08.000000000 +0000
@@ -84,7 +84,6 @@
 } _auide_hwif;
 
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-
 /* HD white list */
 static const struct drive_list_entry dma_white_list [] = {
 /*

-- 
Martin Michlmayr
http://www.cyrius.com/

<Prev in Thread] Current Thread [Next in Thread>