From d22aea84189b1205bbc5855b824c296303ebd55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Mon, 8 Mar 2010 16:11:51 +0100
Subject: [PATCH] --- yaml --- r: 201609 b: refs/heads/master c:
 d57351a30fb02a345b9328adb73250310425421c h: refs/heads/master i:   201607:
 74460f6b1c0b389ef40252afc5ea31fc9b5c2a94 v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/arm/mach-mx3/mach-qong.c             |  3 +--
 .../arch/arm/plat-mxc/include/mach/board-qong.h | 17 -----------------
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/board-qong.h

diff --git a/[refs] b/[refs]
index 3b4bd90fc700..590811490473 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1faeaab27b0b9d35acb3ce3a333cb38a30136a11
+refs/heads/master: d57351a30fb02a345b9328adb73250310425421c
diff --git a/trunk/arch/arm/mach-mx3/mach-qong.c b/trunk/arch/arm/mach-mx3/mach-qong.c
index e5b5b8323a17..62281ad1ff45 100644
--- a/trunk/arch/arm/mach-mx3/mach-qong.c
+++ b/trunk/arch/arm/mach-mx3/mach-qong.c
@@ -34,7 +34,6 @@
 #include <mach/common.h>
 #include <asm/page.h>
 #include <asm/setup.h>
-#include <mach/board-qong.h>
 #include <mach/imx-uart.h>
 #include <mach/iomux-mx3.h>
 #include "devices.h"
@@ -116,7 +115,7 @@ static struct physmap_flash_data qong_flash_data = {
 
 static struct resource qong_flash_resource = {
 	.start = MX31_CS0_BASE_ADDR,
-	.end = MX31_CS0_BASE_ADDR + QONG_NOR_SIZE - 1,
+	.end = MX31_CS0_BASE_ADDR + SZ_128M - 1,
 	.flags = IORESOURCE_MEM,
 };
 
diff --git a/trunk/arch/arm/plat-mxc/include/mach/board-qong.h b/trunk/arch/arm/plat-mxc/include/mach/board-qong.h
deleted file mode 100644
index 6d88c7af4b23..000000000000
--- a/trunk/arch/arm/plat-mxc/include/mach/board-qong.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2009 Ilya Yanok, Emcraft Systems Ltd, <yanok@emcraft.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARCH_MXC_BOARD_QONG_H__
-#define __ASM_ARCH_MXC_BOARD_QONG_H__
-
-/* NOR FLASH */
-#define QONG_NOR_SIZE		(128*1024*1024)
-
-#endif /* __ASM_ARCH_MXC_BOARD_QONG_H__ */