diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-28 11:57:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-28 12:00:02 -0400 |
| commit | 7c896834735f497cc405068d16a51717f993af7f (patch) | |
| tree | 1de88e4568f65e9bcd90529fe2c864aba7c4a052 | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
struct at91_nand has been renamed atmel_nand. Fix the four boards that
were added since the patch was created.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-at91/board-qil-a9260.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-usb-a9260.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-usb-a9263.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index 99b4ec3818d6..f847a53b4eb6 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c | |||
| @@ -140,7 +140,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio | |||
| 140 | return ek_nand_partition; | 140 | return ek_nand_partition; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | static struct at91_nand_data __initdata ek_nand_data = { | 143 | static struct atmel_nand_data __initdata ek_nand_data = { |
| 144 | .ale = 21, | 144 | .ale = 21, |
| 145 | .cle = 22, | 145 | .cle = 22, |
| 146 | // .det_pin = ... not connected | 146 | // .det_pin = ... not connected |
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 45617c201240..a751a7d615cf 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
| @@ -143,7 +143,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio | |||
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | /* det_pin is not connected */ | 145 | /* det_pin is not connected */ |
| 146 | static struct at91_nand_data __initdata ek_nand_data = { | 146 | static struct atmel_nand_data __initdata ek_nand_data = { |
| 147 | .ale = 21, | 147 | .ale = 21, |
| 148 | .cle = 22, | 148 | .cle = 22, |
| 149 | .rdy_pin = AT91_PIN_PC13, | 149 | .rdy_pin = AT91_PIN_PC13, |
diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c index 837aedf8ffeb..0339a7b6f049 100644 --- a/arch/arm/mach-at91/board-usb-a9260.c +++ b/arch/arm/mach-at91/board-usb-a9260.c | |||
| @@ -114,7 +114,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio | |||
| 114 | return ek_nand_partition; | 114 | return ek_nand_partition; |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | static struct at91_nand_data __initdata ek_nand_data = { | 117 | static struct atmel_nand_data __initdata ek_nand_data = { |
| 118 | .ale = 21, | 118 | .ale = 21, |
| 119 | .cle = 22, | 119 | .cle = 22, |
| 120 | // .det_pin = ... not connected | 120 | // .det_pin = ... not connected |
diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c index 95800d32bd49..128570669812 100644 --- a/arch/arm/mach-at91/board-usb-a9263.c +++ b/arch/arm/mach-at91/board-usb-a9263.c | |||
| @@ -127,7 +127,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio | |||
| 127 | return ek_nand_partition; | 127 | return ek_nand_partition; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | static struct at91_nand_data __initdata ek_nand_data = { | 130 | static struct atmel_nand_data __initdata ek_nand_data = { |
| 131 | .ale = 21, | 131 | .ale = 21, |
| 132 | .cle = 22, | 132 | .cle = 22, |
| 133 | // .det_pin = ... not connected | 133 | // .det_pin = ... not connected |