From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: dhowells@redhat.com
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH 04/11] avr32: fix build failures from mis-naming of atmel_nand.h
Date: Sun, 1 Apr 2012 16:38:40 -0400 [thread overview]
Message-ID: <1333312727-11428-5-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c
"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>
---
arch/avr32/mach-at32ap/include/mach/board.h | 2 +-
include/linux/platform_data/atmel.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index 7173386..70742ec 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -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)
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index d056263..b0f2c56 100644
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -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__ */
--
1.7.9.1
next prev parent reply other threads:[~2012-04-01 20:40 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-01 20:38 [PATCH 00/11] Fix up more asm/system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split Paul Gortmaker
2012-04-01 20:38 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout Paul Gortmaker
2012-04-02 21:16 ` David Brown
2012-04-01 20:38 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up Paul Gortmaker
2012-04-01 20:38 ` Paul Gortmaker [this message]
2012-04-01 20:38 ` [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split Paul Gortmaker
2012-04-01 20:38 ` [PATCH 07/11] sh: fix several build failures from system.h fallout Paul Gortmaker
2012-04-02 1:00 ` Paul Mundt
2012-04-02 18:15 ` Paul Gortmaker
2012-04-02 23:57 ` Stephen Rothwell
2012-04-05 2:46 ` Paul Gortmaker
2012-04-05 2:49 ` Paul Gortmaker
2012-04-05 15:15 ` Paul Mundt
2012-04-06 6:40 ` linux-next: sh tree (Was:Re: [PATCH 07/11] sh: fix several build failures from system.h fallout) Stephen Rothwell
2012-04-01 20:38 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL Paul Gortmaker
2012-04-01 20:38 ` [PATCH 09/11] firewire: restore the device.h include in linux/firewire.h Paul Gortmaker
2012-04-01 20:38 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle Paul Gortmaker
2012-04-01 20:38 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h Paul Gortmaker
2012-04-06 6:28 ` Jonas Bonn
2012-04-02 0:03 ` [PATCH 00/11] Fix up more asm/system.h fallout Stephen Rothwell
2012-04-02 5:30 ` David Howells
2012-04-02 5:43 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL David Howells
2012-04-02 5:44 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout David Howells
2012-04-02 5:45 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split David Howells
2012-04-02 5:47 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up David Howells
2012-04-02 19:11 ` Paul Gortmaker
2012-04-02 5:49 ` [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout David Howells
2012-04-02 5:50 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split David Howells
2012-04-02 5:52 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle David Howells
2012-04-02 15:59 ` Chris Metcalf
2012-04-02 18:05 ` Paul Gortmaker
2012-04-02 5:53 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1333312727-11428-5-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=plagnioj@jcrosoft.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).