avr32: fix build failures from mis-naming of atmel_nand.h

PATCH New Paul Gortmaker 3 participants 7 messages Mar 21, 2012 – Mar 23, 2012

Subsystems (6)

Arm (32-bit) Arm sub-architectures Linux-next tree Memory technology devices (MTD) +2 more subsystems

lore

Share & tools

lore

Paul Gortmaker

author

2012-03-21 02:15 UTC #0 lore raw

PATCH 1/1 avr32: fix build failures from mis-naming of atmel_nand.h

Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)

"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

Rename the file to match the original intention, and fix up the users who reference the bad name without the _nand suffix.

Signed-off-by Paul Gortmaker <[email protected]>

CC Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

CC Hans-Christian Egtvedt <[email protected]>

CC David Woodhouse <[email protected]>

---
 arch/arm/mach-at91/include/mach/board.h            |    2 +-
 drivers/mtd/nand/atmel_nand.c                      |    2 +-
 .../linux/platform_data/{atmel.h => atmel_nand.h}  |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/platform_data/{atmel.h => atmel_nand.h} (100%)

arch/arm/mach-at91/include/mach/board.h +1 -1

index 544a5d5..aa0e083 100644
@@ -41,7 +41,7 @@
 #include <sound/atmel-ac97c.h>
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>
-#include <linux/platform_data/atmel.h>
+#include <linux/platform_data/atmel_nand.h>
 
  /* USB Device */
 struct at91_udc_data {

drivers/mtd/nand/atmel_nand.c +1 -1

index 2165576..7b599a9 100644
@@ -38,7 +38,7 @@
 #include <linux/dmaengine.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
-#include <linux/platform_data/atmel.h>
+#include <linux/platform_data/atmel_nand.h>
 
 #include <mach/cpu.h>

include/linux/platform_data/atmel_nand.h renamed from include/linux/platform_data/atmel.h +0 -0

similarity index 100%
rename from include/linux/platform_data/atmel.h
rename to include/linux/platform_data/atmel_nand.h

Signature · 1 line

1.7.9.1

Hans-Christian Egtvedt

2012-03-21 07:26 UTC #1 lore raw

PATCH 1/1 avr32: fix build failures from mis-naming of atmel_nand.h

Quoted 20 lines · Paul Gortmaker

Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)
"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

Quoted 2 lines

Rename the file to match the original intention, and fix up the users who reference the bad name without the _nand suffix.

Thanks fixing this.

Quoted 4 lines

Signed-off-by Paul Gortmaker <[email protected]>
CC Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
CC Hans-Christian Egtvedt <[email protected]>
CC David Woodhouse <[email protected]>

Acked-by Hans-Christian Egtvedt <[email protected]>

Quoted 37 lines

---
 arch/arm/mach-at91/include/mach/board.h            |    2 +-
 drivers/mtd/nand/atmel_nand.c                      |    2 +-
 .../linux/platform_data/{atmel.h => atmel_nand.h}  |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/platform_data/{atmel.h => atmel_nand.h} (100%)

arch/arm/mach-at91/include/mach/board.h +1 -1

index 544a5d5..aa0e083 100644
@@ -41,7 +41,7 @@
 #include <sound/atmel-ac97c.h>
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>
-#include <linux/platform_data/atmel.h>
+#include <linux/platform_data/atmel_nand.h>
 
  /* USB Device */
 struct at91_udc_data {

drivers/mtd/nand/atmel_nand.c +1 -1

index 2165576..7b599a9 100644
@@ -38,7 +38,7 @@
 #include <linux/dmaengine.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
-#include <linux/platform_data/atmel.h>
+#include <linux/platform_data/atmel_nand.h>
 
 #include <mach/cpu.h>

include/linux/platform_data/atmel_nand.h renamed from include/linux/platform_data/atmel.h +0 -0

similarity index 100%
rename from include/linux/platform_data/atmel.h
rename to include/linux/platform_data/atmel_nand.h

Signature · 2 lines

mvh
Hans-Christian Egtvedt

Nicolas Ferre

2012-03-21 08:26 UTC #2 lore raw

PATCH 1/1 avr32: fix build failures from mis-naming of atmel_nand.h

On 03/21/2012 08:26 AM, Hans-Christian Egtvedt :

Quoted 21 lines

Quoted 20 lines · Paul Gortmaker
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)
"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

Quoted 4 lines

Quoted 2 lines
Rename the file to match the original intention, and fix up the users who reference the bad name without the _nand suffix.
Thanks fixing this.

Yes, we need to fix this. But I would not like to see this "platform_data/atmel.h" renamed: I think that this file was designed to collect several common platform data (ie: not just NAND related).

So maybe we should just rename the entry that exists in mach-at32ap/include/mach/board.h
and remove all occurrences of platform_data/atmel_nand.h

Quoted 5 lines

Quoted 4 lines
Signed-off-by Paul Gortmaker <[email protected]>
CC Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
CC Hans-Christian Egtvedt <[email protected]>
CC David Woodhouse <[email protected]>

Quoted 8 lines

Acked-by Hans-Christian Egtvedt <[email protected]>

Quoted 6 lines

---
 arch/arm/mach-at91/include/mach/board.h            |    2 +-
 drivers/mtd/nand/atmel_nand.c                      |    2 +-
 .../linux/platform_data/{atmel.h => atmel_nand.h}  |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/linux/platform_data/{atmel.h => atmel_nand.h} (100%)

No please.

Quoted 25 lines

arch/arm/mach-at91/include/mach/board.h +1 -1

index 544a5d5..aa0e083 100644
@@ -41,7 +41,7 @@
 #include <sound/atmel-ac97c.h>
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>
-#include <linux/platform_data/atmel.h>
+#include <linux/platform_data/atmel_nand.h>
 
  /* USB Device */
 struct at91_udc_data {

drivers/mtd/nand/atmel_nand.c +1 -1

index 2165576..7b599a9 100644
@@ -38,7 +38,7 @@
 #include <linux/dmaengine.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
-#include <linux/platform_data/atmel.h>
+#include <linux/platform_data/atmel_nand.h>

Quoted 6 lines

include/linux/platform_data/atmel_nand.h
Quoted 6 lines
drivers/mtd/nand/atmel_nand.c +0 -0
 #include <mach/cpu.h>
 
include/linux/platform_data/atmel_nand.h renamed from include/linux/platform_data/atmel.h +0 -0
similarity index 100%
rename from include/linux/platform_data/atmel.h
rename to include/linux/platform_data/atmel_nand.h

Best regards,

Signature · 1 line

Nicolas Ferre

Paul Gortmaker

author

2012-03-22 05:18 UTC #3 lore raw

PATCH 1/1 avr32: fix build failures from mis-naming of atmel_nand.h

Quoted 28 lines · [Re: [PATCH] avr32: fix build failures from mis-naming of atmel_nand.h] On…

On 03/21/2012 08:26 AM, Hans-Christian Egtvedt :
Quoted 21 lines
Quoted 20 lines · Paul Gortmaker
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)
"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
Quoted 4 lines
Quoted 2 lines
Rename the file to match the original intention, and fix up the users who reference the bad name without the _nand suffix.
Thanks fixing this.

Quoted 7 lines

Yes, we need to fix this. But I would not like to see this "platform_data/atmel.h" renamed: I think that this file was designed to collect several common platform data (ie: not just NAND related).
So maybe we should just rename the entry that exists in mach-at32ap/include/mach/board.h
and remove all occurrences of platform_data/atmel_nand.h

Funny, since this is what I did 1st before I re-read the original commit log in more detail. :) Oh well. Here is the alternate solution. You guys can pick whichever one you like best. I compile tested this one as well.

Thanks,
Paul.
---

Quoted 1 line

From 73c01b7ed8fd2732661fa1ca726c48096f4651f2 Mon Sep 17 00:00:00 2001

From: Paul Gortmaker <[email protected]>
Date: Tue, 20 Mar 2012 21:55:46 -0400
Subject: [PATCH] avr32: fix build failures from mis-naming of atmel_nand.h

Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)

"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:

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.

Signed-off-by Paul Gortmaker <[email protected]>

CC Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

CC Hans-Christian Egtvedt <[email protected]>

CC David Woodhouse <[email protected]>

arch/avr32/mach-at32ap/include/mach/board.h +1 -1

index 7173386..70742ec 100644
@@ -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)

include/linux/platform_data/atmel.h +3 -3

index d056263..b0f2c56 100644
@@ -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__ */

Signature · 1 line

1.7.9.1

Hans-Christian Egtvedt

2012-03-22 12:33 UTC #4 lore raw

PATCH 1/1 avr32: fix build failures from mis-naming of atmel_nand.h

Quoted 34 lines · Paul Gortmaker

Quoted 32 lines · [Re: [PATCH] avr32: fix build failures from mis-naming of atmel_nand.h] On…
On 03/21/2012 08:26 AM, Hans-Christian Egtvedt :
Quoted 21 lines
Quoted 20 lines · Paul Gortmaker
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)
"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
Quoted 4 lines
Quoted 2 lines
Rename the file to match the original intention, and fix up the users who reference the bad name without the _nand suffix.
Thanks fixing this.
Yes, we need to fix this. But I would not like to see this "platform_data/atmel.h" renamed: I think that this file was designed to collect several common platform data (ie: not just NAND related).

Quoted 8 lines

Quoted 3 lines
So maybe we should just rename the entry that exists in mach-at32ap/include/mach/board.h
and remove all occurrences of platform_data/atmel_nand.h
Funny, since this is what I did 1st before I re-read the original commit log in more detail. :) Oh well. Here is the alternate solution. You guys can pick whichever one you like best. I compile tested this one as well.

I'll leave it to Nicolas to sign-off on this, but the changes look fine for me.

Quoted 27 lines

---
From 73c01b7ed8fd2732661fa1ca726c48096f4651f2 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <[email protected]>
Date: Tue, 20 Mar 2012 21:55:46 -0400
Subject: [PATCH] avr32: fix build failures from mis-naming of atmel_nand.h
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)
"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

Quoted 8 lines

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.
Signed-off-by Paul Gortmaker <[email protected]>
CC Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
CC Hans-Christian Egtvedt <[email protected]>
CC David Woodhouse <[email protected]>

Acked-by Hans-Christian Egtvedt <[email protected]>

Quoted 34 lines

arch/avr32/mach-at32ap/include/mach/board.h +1 -1

index 7173386..70742ec 100644
@@ -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)

include/linux/platform_data/atmel.h +3 -3

index d056263..b0f2c56 100644
@@ -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__ */

Signature · 2 lines

mvh
Hans-Christian Egtvedt

Nicolas Ferre

2012-03-22 14:04 UTC #5 lore raw

PATCH 1/1 avr32: fix build failures from mis-naming of atmel_nand.h

On 03/22/2012 01:33 PM, Hans-Christian Egtvedt :

Quoted 39 lines

Quoted 38 lines · Paul Gortmaker
Quoted 35 lines · [Re: [PATCH] avr32: fix build failures from mis-naming of atmel_nand.h] On…
On 03/21/2012 08:26 AM, Hans-Christian Egtvedt :
Quoted 21 lines
Quoted 20 lines · Paul Gortmaker
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)
"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
Quoted 4 lines
Quoted 2 lines
Rename the file to match the original intention, and fix up the users who reference the bad name without the _nand suffix.
Thanks fixing this.
Yes, we need to fix this. But I would not like to see this "platform_data/atmel.h" renamed: I think that this file was designed to collect several common platform data (ie: not just NAND related).
So maybe we should just rename the entry that exists in mach-at32ap/include/mach/board.h
and remove all occurrences of platform_data/atmel_nand.h

Quoted 7 lines

Quoted 4 lines
Funny, since this is what I did 1st before I re-read the original commit log in more detail. :) Oh well. Here is the alternate solution. You guys can pick whichever one you like best. I compile tested this one as well.
I'll leave it to Nicolas to sign-off on this, but the changes look fine for me.

Ok, which way do you want to follow for inclusion in mainline? I take it through arm-soc?

Quoted 31 lines

Quoted 31 lines
---
From 73c01b7ed8fd2732661fa1ca726c48096f4651f2 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <[email protected]>
Date: Tue, 20 Mar 2012 21:55:46 -0400
Subject: [PATCH] avr32: fix build failures from mis-naming of atmel_nand.h
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c (linux-next)
"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.

Quoted 6 lines

Quoted 4 lines
Signed-off-by Paul Gortmaker <[email protected]>
CC Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
CC Hans-Christian Egtvedt <[email protected]>
CC David Woodhouse <[email protected]>
Acked-by Hans-Christian Egtvedt <[email protected]>

Signed-off-by Nicolas Ferre <[email protected]>

Quoted 35 lines

arch/avr32/mach-at32ap/include/mach/board.h +1 -1

index 7173386..70742ec 100644
@@ -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)

include/linux/platform_data/atmel.h +3 -3

index d056263..b0f2c56 100644
@@ -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__ */

Signature · 1 line

Nicolas Ferre

Hans-Christian Egtvedt

2012-03-23 07:38 UTC #6 lore raw

PATCH 1/1 avr32: fix build failures from mis-naming of atmel_nand.h

Quoted 2 lines · Nicolas Ferre

On 03/22/2012 01:33 PM, Hans-Christian Egtvedt :
Quoted 1 line
Around Thu 22 Mar 2012 01:18:40 -0400 or thereabout, Paul Gortmaker wrote:

Quoted 13 lines

Quoted 13 lines
Quoted 12 lines
Quoted 7 lines
Yes, we need to fix this. But I would not like to see this "platform_data/atmel.h" renamed: I think that this file was designed to collect several common platform data (ie: not just NAND related).
So maybe we should just rename the entry that exists in mach-at32ap/include/mach/board.h
and remove all occurrences of platform_data/atmel_nand.h
Funny, since this is what I did 1st before I re-read the original commit log in more detail. :) Oh well. Here is the alternate solution. You guys can pick whichever one you like best. I compile tested this one as well.

Quoted 5 lines

Quoted 2 lines
I'll leave it to Nicolas to sign-off on this, but the changes look fine for me.
Ok, which way do you want to follow for inclusion in mainline? I take it through arm-soc?

I have not gotten my key signed by any kernel developers yet, so typically I've asked people to take it through Andrew's tree.

<snipp>

Signature · 1 line

HcE