From 385c6d873e662781ff3e84fae765a37e7f2cdba4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 25 Jun 2012 23:12:06 +0100 Subject: [PATCH] Add patch to fix ARM OMAP build --- arm-omap-fixmtd.patch | 16 ++++++++++++++++ kernel.spec | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 arm-omap-fixmtd.patch diff --git a/arm-omap-fixmtd.patch b/arm-omap-fixmtd.patch new file mode 100644 index 000000000..8e4db1a86 --- /dev/null +++ b/arm-omap-fixmtd.patch @@ -0,0 +1,16 @@ +diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c +index 70a81f9..53c39d2 100644 +--- a/arch/arm/mach-omap2/board-flash.c ++++ b/arch/arm/mach-omap2/board-flash.c +@@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, + + 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/kernel.spec b/kernel.spec index 54febf470..4e9ebddd8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -717,6 +717,7 @@ Patch20000: uprobes-3.5-tip.patch # ARM # OMAP +Patch21000: arm-omap-fixmtd.patch # ARM tegra Patch21004: arm-tegra-nvec-kconfig.patch @@ -1297,6 +1298,7 @@ ApplyPatch taint-vbox.patch # # ARM # +ApplyPatch arm-omap-fixmtd.patch ApplyPatch arm-tegra-nvec-kconfig.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch ApplyPatch arm-tegra-sdhci-module-fix.patch @@ -2275,6 +2277,9 @@ fi # ||----w | # || || %changelog +* Mon Jun 25 2012 Peter Robinson +- Add patch to fix ARM OMAP build + * Mon Jun 25 2012 Justin M. Forbes - 3.5.0-0.rc4.git0.1 - Disable debugging options.