25 lines
914 B
Diff
25 lines
914 B
Diff
|
--- 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) || \
|