diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/mtd/devices/doc2001.c | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/mtd/devices/doc2001.c')
| -rw-r--r-- | drivers/mtd/devices/doc2001.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c index fcb28a6fd89f..681a9c73a2a3 100644 --- a/drivers/mtd/devices/doc2001.c +++ b/drivers/mtd/devices/doc2001.c | |||
| @@ -103,7 +103,7 @@ static inline int DoC_WaitReady(void __iomem * docptr) | |||
| 103 | with the internal pipeline. Each of 4 delay cycles (read from the NOP register) is | 103 | with the internal pipeline. Each of 4 delay cycles (read from the NOP register) is |
| 104 | required after writing to CDSN Control register, see Software Requirement 11.4 item 3. */ | 104 | required after writing to CDSN Control register, see Software Requirement 11.4 item 3. */ |
| 105 | 105 | ||
| 106 | static inline void DoC_Command(void __iomem * docptr, unsigned char command, | 106 | static void DoC_Command(void __iomem * docptr, unsigned char command, |
| 107 | unsigned char xtraflags) | 107 | unsigned char xtraflags) |
| 108 | { | 108 | { |
| 109 | /* Assert the CLE (Command Latch Enable) line to the flash chip */ | 109 | /* Assert the CLE (Command Latch Enable) line to the flash chip */ |