diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-21 14:55:09 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-21 14:55:09 -0500 |
| commit | 57550b27ff5a13b00370fbfa34f2471c3456a41d (patch) | |
| tree | 09fbe86a7454b109821ae21a8f285d1f764eeaa8 /arch/mips/rb532/devices.c | |
| parent | bfe085f62f98a49e1b864e4950389c7205174e4f (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into x86/urgent
Diffstat (limited to 'arch/mips/rb532/devices.c')
| -rw-r--r-- | arch/mips/rb532/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index 2f22d714d5b0..c1c29181bd46 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c | |||
| @@ -118,7 +118,7 @@ static struct platform_device cf_slot0 = { | |||
| 118 | /* Resources and device for NAND */ | 118 | /* Resources and device for NAND */ |
| 119 | static int rb532_dev_ready(struct mtd_info *mtd) | 119 | static int rb532_dev_ready(struct mtd_info *mtd) |
| 120 | { | 120 | { |
| 121 | return readl(IDT434_REG_BASE + GPIOD) & GPIO_RDY; | 121 | return gpio_get_value(GPIO_RDY); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | static void rb532_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) | 124 | static void rb532_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) |