diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
| commit | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (patch) | |
| tree | 075fbf70c17a50190c3fb290eb6b362177f0d1e5 /drivers/ata | |
| parent | 18aa86831ed72380b7c2edba3c27bbf7a999da76 (diff) | |
| parent | 1e7f2bd25c28b36c7c40ed4797b2a21cc4e1502e (diff) | |
| download | barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.gz barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
scripts/Makefile
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci.c | 3 | ||||
| -rw-r--r-- | drivers/ata/ide-sff.c | 1 | ||||
| -rw-r--r-- | drivers/ata/pata-imx.c | 1 | ||||
| -rw-r--r-- | drivers/ata/sata-imx.c | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index f9cf2d1436..9ba18a3c6e 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -29,6 +29,7 @@ #include <init.h> #include <errno.h> #include <io.h> +#include <of.h> #include <malloc.h> #include <scsi.h> #include <linux/ctype.h> @@ -375,7 +376,7 @@ static int ahci_init_port(struct ahci_port *ahci_port) ret = wait_on_timeout(WAIT_LINKUP, (ahci_port_read(ahci_port, PORT_SCR_STAT) & 0xf) == 0x3); if (ret) { - ahci_port_info(ahci_port, "SATA link timeout\n");; + ahci_port_info(ahci_port, "SATA link timeout\n"); ret = -ETIMEDOUT; goto err_init; } diff --git a/drivers/ata/ide-sff.c b/drivers/ata/ide-sff.c index a7f2647afd..3d5932e278 100644 --- a/drivers/ata/ide-sff.c +++ b/drivers/ata/ide-sff.c @@ -1,6 +1,7 @@ #include <common.h> #include <ata_drive.h> #include <io.h> +#include <errno.h> #include <clock.h> #include <disks.h> #include <malloc.h> diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c index 0e348069fe..7f9e39b503 100644 --- a/drivers/ata/pata-imx.c +++ b/drivers/ata/pata-imx.c @@ -30,6 +30,7 @@ #include <ata_drive.h> #include <platform_ide.h> #include <io.h> +#include <of.h> #include <linux/err.h> #include <linux/clk.h> diff --git a/drivers/ata/sata-imx.c b/drivers/ata/sata-imx.c index ef7989e610..b7bd1107cc 100644 --- a/drivers/ata/sata-imx.c +++ b/drivers/ata/sata-imx.c @@ -1,6 +1,7 @@ #include <common.h> #include <ata_drive.h> #include <io.h> +#include <of.h> #include <clock.h> #include <disks.h> #include <driver.h> |