diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-perseus2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 534dcfb9d263..e79749df434b 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <asm/arch/gpio.h> | 30 | #include <asm/arch/gpio.h> |
31 | #include <asm/arch/mux.h> | 31 | #include <asm/arch/mux.h> |
32 | #include <asm/arch/fpga.h> | 32 | #include <asm/arch/fpga.h> |
33 | #include <asm/arch/nand.h> | ||
33 | #include <asm/arch/keypad.h> | 34 | #include <asm/arch/keypad.h> |
34 | #include <asm/arch/common.h> | 35 | #include <asm/arch/common.h> |
35 | #include <asm/arch/board.h> | 36 | #include <asm/arch/board.h> |
@@ -133,7 +134,7 @@ static struct platform_device nor_device = { | |||
133 | .resource = &nor_resource, | 134 | .resource = &nor_resource, |
134 | }; | 135 | }; |
135 | 136 | ||
136 | static struct nand_platform_data nand_data = { | 137 | static struct omap_nand_platform_data nand_data = { |
137 | .options = NAND_SAMSUNG_LP_OPTIONS, | 138 | .options = NAND_SAMSUNG_LP_OPTIONS, |
138 | }; | 139 | }; |
139 | 140 | ||
@@ -202,7 +203,7 @@ static struct platform_device *devices[] __initdata = { | |||
202 | 203 | ||
203 | #define P2_NAND_RB_GPIO_PIN 62 | 204 | #define P2_NAND_RB_GPIO_PIN 62 |
204 | 205 | ||
205 | static int nand_dev_ready(struct nand_platform_data *data) | 206 | static int nand_dev_ready(struct omap_nand_platform_data *data) |
206 | { | 207 | { |
207 | return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN); | 208 | return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN); |
208 | } | 209 | } |