From a3426b3966597c4c57b291e7f02f6df5b6f95607 Mon Sep 17 00:00:00 2001
From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Date: Fri, 22 Sep 2006 10:09:44 +0100
Subject: [PATCH] --- yaml --- r: 34137 b: refs/heads/master c:
 cbc88ba83ff772d8c47d95ba0fef38ad888d6fcf h: refs/heads/master i:   34135:
 b979978f3c38a54b2e22fa01f68a0380a722630e v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/mtd/nand/au1550nd.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index beb83ac40e19..f4d8f0ddcee6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 187ef15268e638603dea55a91fdfa29feaed6d13
+refs/heads/master: cbc88ba83ff772d8c47d95ba0fef38ad888d6fcf
diff --git a/trunk/drivers/mtd/nand/au1550nd.c b/trunk/drivers/mtd/nand/au1550nd.c
index 31228334da12..09e421a96893 100644
--- a/trunk/drivers/mtd/nand/au1550nd.c
+++ b/trunk/drivers/mtd/nand/au1550nd.c
@@ -21,18 +21,7 @@
 #include <linux/version.h>
 #include <asm/io.h>
 
-/* fixme: this is ugly */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
 #include <asm/mach-au1x00/au1xxx.h>
-#else
-#include <asm/au1000.h>
-#ifdef CONFIG_MIPS_PB1550
-#include <asm/pb1550.h>
-#endif
-#ifdef CONFIG_MIPS_DB1550
-#include <asm/db1x00.h>
-#endif
-#endif
 
 /*
  * MTD structure for NAND controller