fix flash struct collision


diff -r ab7e6c7e1b19 -r 80e54b5fa257 drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c	Mon Feb 01 21:55:08 2010 -0800
+++ b/drivers/mtd/devices/m25p80.c	Mon Feb 01 21:56:36 2010 -0800
@@ -592,7 +592,7 @@
  */
 static int __devinit m25p_probe(struct spi_device *spi)
 {
-	struct flash_platform_data	*data;
+	struct spi_flash_platform_data	*data;
 	struct m25p			*flash;
 	struct flash_info		*info;
 	unsigned			i;
diff -r ab7e6c7e1b19 -r 80e54b5fa257 include/linux/spi/flash.h
--- a/include/linux/spi/flash.h	Mon Feb 01 21:55:08 2010 -0800
+++ b/include/linux/spi/flash.h	Mon Feb 01 21:56:36 2010 -0800
@@ -18,7 +18,7 @@
  * Note that for DataFlash, sizes for pages, blocks, and sectors are
  * rarely powers of two; and partitions should be sector-aligned.
  */
-struct flash_platform_data {
+struct spi_flash_platform_data {
 	char		*name;
 	struct mtd_partition *parts;
 	unsigned int	nr_parts;
