From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 12 Aug 2008 10:28:00 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: upstream/snapshot3+hdmi~21901^2~51
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=742c52533b05d8ae83c794bd6811100675b85ce5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-arm/arch-omap/onenand.h
---

742c52533b05d8ae83c794bd6811100675b85ce5
diff --cc arch/arm/plat-omap/include/mach/onenand.h
index 0000000,d57f202..4649d30
mode 000000,100644..100644
--- a/arch/arm/plat-omap/include/mach/onenand.h
+++ b/arch/arm/plat-omap/include/mach/onenand.h
@@@ -1,0 -1,21 +1,25 @@@
+ /*
+  * arch/arm/plat-omap/include/mach/onenand.h
+  *
+  * Copyright (C) 2006 Nokia Corporation
+  * Author: Juha Yrjola
+  *
+  * 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.
+  */
+ 
+ #include <linux/mtd/partitions.h>
+ 
+ struct omap_onenand_platform_data {
+ 	int			cs;
+ 	int			gpio_irq;
+ 	struct mtd_partition	*parts;
+ 	int			nr_parts;
 -	int                     (*onenand_setup)(void __iomem *);
++	int                     (*onenand_setup)(void __iomem *, int freq);
+ 	int			dma_channel;
+ };
++
++int omap2_onenand_rephase(void);
++
++#define ONENAND_MAX_PARTITIONS 8