]> git.karo-electronics.de Git - mv-sheeva.git/commit
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)
commit3d92e05118262379f76a220772b666dfddb77a9d
treea63a1e55edd9bfa3e9ff9e1f8e2d09fe12b11615
parentb443caf12f9ee14e9843e53d4d929319e637275a
avr32: fix build failures from mis-naming of atmel_nand.h

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>
arch/avr32/mach-at32ap/include/mach/board.h
include/linux/platform_data/atmel.h