summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-usb-a9260.c
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-07-28 17:57:22 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-28 18:00:02 +0200
commit7c896834735f497cc405068d16a51717f993af7f (patch)
tree1de88e4568f65e9bcd90529fe2c864aba7c4a052 /arch/arm/mach-at91/board-usb-a9260.c
parentMerge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
downloadlinux-7c896834735f497cc405068d16a51717f993af7f.tar.xz
linux-7c896834735f497cc405068d16a51717f993af7f.zip
[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>
Diffstat (limited to 'arch/arm/mach-at91/board-usb-a9260.c')
-rw-r--r--arch/arm/mach-at91/board-usb-a9260.c2
1 files changed, 1 insertions, 1 deletions
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
return ek_nand_partition;
}
-static struct at91_nand_data __initdata ek_nand_data = {
+static struct atmel_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected