From be25d944564ce1377cf9622730389963151d0b86 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 11 Jun 2012 12:55:51 +0100
Subject: [PATCH] update ARM OMAP patch with another fix

---
 arm-omap-3.5-fixes.patch | 24 ++++++++++++++++++++++++
 arm-omap-dsp-inc.patch   | 10 ----------
 kernel.spec              |  4 ++--
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 arm-omap-3.5-fixes.patch
 delete mode 100644 arm-omap-dsp-inc.patch

diff --git a/arm-omap-3.5-fixes.patch b/arm-omap-3.5-fixes.patch
new file mode 100644
index 000000000..f88f1de78
--- /dev/null
+++ b/arm-omap-3.5-fixes.patch
@@ -0,0 +1,24 @@
+--- linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/dsp.c.orig	2012-06-10 05:54:50.000000000 -0400
++++ linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/dsp.c	2012-06-10 05:55:38.000000000 -0400
+@@ -20,6 +20,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/platform_device.h>
++#include <asm/memblock.h>
+ #include "cm2xxx_3xxx.h"
+ #include "prm2xxx_3xxx.h"
+ #ifdef CONFIG_BRIDGE_DVFS
+--- linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/board-flash.c.orig	2012-06-11 02:30:19.000000000 -0400
++++ linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/board-flash.c	2012-06-11 02:31:05.000000000 -0400
+@@ -97,11 +97,6 @@
+ 
+ 	gpmc_onenand_init(&board_onenand_data);
+ }
+-#else
+-void
+-__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
+-{
+-}
+ #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */
+ 
+ #if defined(CONFIG_MTD_NAND_OMAP2) || \
diff --git a/arm-omap-dsp-inc.patch b/arm-omap-dsp-inc.patch
deleted file mode 100644
index 8b69833b3..000000000
--- a/arm-omap-dsp-inc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/dsp.c.orig	2012-06-10 05:54:50.000000000 -0400
-+++ linux-3.5.0-0.rc2.git0.1.fc17.armv7hl/arch/arm/mach-omap2/dsp.c	2012-06-10 05:55:38.000000000 -0400
-@@ -20,6 +20,7 @@
- 
- #include <linux/module.h>
- #include <linux/platform_device.h>
-+#include <asm/memblock.h>
- #include "cm2xxx_3xxx.h"
- #include "prm2xxx_3xxx.h"
- #ifdef CONFIG_BRIDGE_DVFS
diff --git a/kernel.spec b/kernel.spec
index 9bd533311..caad5aea9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -715,7 +715,7 @@ Patch14010: lis3-improve-handling-of-null-rate.patch
 
 # ARM
 # OMAP
-Patch21000: arm-omap-dsp-inc.patch
+Patch21000: arm-omap-3.5-fixes.patch
 
 # ARM tegra
 Patch21004: arm-tegra-nvec-kconfig.patch
@@ -1297,7 +1297,7 @@ ApplyPatch taint-vbox.patch
 #
 # ARM
 #
-ApplyPatch arm-omap-dsp-inc.patch
+ApplyPatch arm-omap-3.5-fixes.patch
 ApplyPatch arm-tegra-nvec-kconfig.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 ApplyPatch arm-tegra-sdhci-module-fix.patch