avr32: fix build failures from mis-naming of atmel_nand.h
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 1 Apr 2012 20:38:40 +0000 (16:38 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Apr 2012 21:41:25 +0000 (14:41 -0700)
Commit bf4289cba02b ("ATMEL: fix nand ecc support") indicated that it
wanted to "Move platform data to a common header
include/linux/platform_data/atmel_nand.h" and the new header even had
re-include protectors with:

    #ifndef __ATMEL_NAND_H__

However, the file that was added was simply called atmel.h
and this caused avr32 defconfig to fail with:

  In file included from arch/avr32/boards/atstk1000/setup.c:22:
  arch/avr32/mach-at32ap/include/mach/board.h:10:44: error: linux/platform_data/atmel_nand.h: No such file or directory
  In file included from arch/avr32/boards/atstk1000/setup.c:22:
  arch/avr32/mach-at32ap/include/mach/board.h:121: warning: 'struct atmel_nand_data' declared inside parameter list
  arch/avr32/mach-at32ap/include/mach/board.h:121: warning: its scope is only this definition or declaration, which is probably not what you want
  make[2]: *** [arch/avr32/boards/atstk1000/setup.o] Error 1

It seems the scope of the file contents will expand beyond
just nand, so ignore the original intention, and fix up the
users who reference the bad name with the _nand suffix.

CC: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
CC: David Woodhouse <dwmw2@infradead.org>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

index 71733866cb4f21c308d5e926b59d261576666741..70742ec997f86eb7ec06304da5715d3acd03569b 100644 (file)
@@ -7,7 +7,7 @@
 #include <linux/types.h>
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>
-#include <linux/platform_data/atmel_nand.h>
+#include <linux/platform_data/atmel.h>
 #define GPIO_PIN_NONE  (-1)
index d056263545b118b09854cc9e5702a682ebc23886..b0f2c56a8ea26c454f3d8cc71661821ec87f38de 100644 (file)
@@ -4,8 +4,8 @@
  * GPL v2 Only
-#ifndef __ATMEL_NAND_H__
-#define __ATMEL_NAND_H__
+#ifndef __ATMEL_H__
+#define __ATMEL_H__
 #include <linux/mtd/nand.h>
@@ -24,4 +24,4 @@ struct atmel_nand_data {
        unsigned int    num_parts;
-#endif /* __ATMEL_NAND_H__ */
+#endif /* __ATMEL_H__ */