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: v2.6.28-rc1~105^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=742c52533b05d8ae83c794bd6811100675b85ce5;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/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 e30237117b69b,d57f20226b287..4649d302c2637
--- a/arch/arm/plat-omap/include/mach/onenand.h
+++ b/arch/arm/plat-omap/include/mach/onenand.h
@@@ -16,11 -16,6 +16,10 @@@ struct omap_onenand_platform_data 
  	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
-