powerpc/usb: fix bug of CPU hang when missing USB PHY clock

[u-boot] / drivers / block / sata_dwc.c

diff --git a/drivers/block/sata_dwc.c b/drivers/block/sata_dwc.c
index 75101b5d798dd8c9a2a03a5f2576a652f65c54cf..28d87f538bff23ab8cd988bdf017c6a1ffd40fe6 100644 (file)
--- a/drivers/block/sata_dwc.c
+++ b/drivers/block/sata_dwc.c
@@ -35,6 +35,7 @@
 #include <asm/io.h>
 #include <malloc.h>
 #include <ata.h>
+#include <sata.h>
 #include <linux/ctype.h>
 
 #include "sata_dwc.h"
@@ -268,8 +269,6 @@ static int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
                unsigned int flags, u16 *id);
 static int check_sata_dev_state(void);
 
-extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
-
 static const struct ata_port_info sata_dwc_port_info[] = {
        {
                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
@@ -1907,7 +1906,7 @@ err_out:
 #define SATA_MAX_WRITE_BLK 0xFFFF
 #endif
 
-ulong sata_write(int device, ulong blknr, lbaint_t blkcnt, void *buffer)
+ulong sata_write(int device, ulong blknr, lbaint_t blkcnt, const void *buffer)
 {
        ulong start,blks, buf_addr;
        unsigned short smallblks;