Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

[karo-tx-uboot.git] / drivers / block / systemace.c

diff --git a/drivers/block/systemace.c b/drivers/block/systemace.c
index 87c6cbc6a0fbb9024efc68b7715e9e45c61bef15..bf29cbbb7a838b4db49b323a9db06942a07fc1ea 100644 (file)
--- a/drivers/block/systemace.c
+++ b/drivers/block/systemace.c
@@ -83,7 +83,7 @@ static u16 ace_readw(unsigned off)
 }
 
 static unsigned long systemace_read(int dev, unsigned long start,
 }
 
 static unsigned long systemace_read(int dev, unsigned long start,

-                                   unsigned long blkcnt, void *buffer);
+                                       lbaint_t blkcnt, void *buffer);

 
 static block_dev_desc_t systemace_dev = { 0 };
 
 
 static block_dev_desc_t systemace_dev = { 0 };
 


@@ -149,7 +149,7 @@ block_dev_desc_t *systemace_get_dev(int dev)
  * number of blocks read. A zero return indicates an error.
  */
 static unsigned long systemace_read(int dev, unsigned long start,
  * number of blocks read. A zero return indicates an error.
  */
 static unsigned long systemace_read(int dev, unsigned long start,

-                                   unsigned long blkcnt, void *buffer)
+                                       lbaint_t blkcnt, void *buffer)

 {
        int retry;
        unsigned blk_countdown;
 {
        int retry;
        unsigned blk_countdown;