summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2010-05-18 02:12:39 +0000
committerChris Johns <chrisj@rtems.org>2010-05-18 02:12:39 +0000
commitbaf64cdb32af311883cec15d511d6a542bc680d7 (patch)
tree01b2d87a69b2795b0293cfea5d6360dbaddcc245 /c
parent2010-05-17 Bharath Suri <bharath.s.jois@gmail.com> (diff)
downloadrtems-baf64cdb32af311883cec15d511d6a542bc680d7.tar.bz2
010-05-18 Chris Johns <chrisj@rtems.org>
* libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: PR 1448/filesystem.
Diffstat (limited to 'c')
-rw-r--r--c/src/ChangeLog5
-rw-r--r--c/src/libchip/i2c/spi-sd-card.c2
-rw-r--r--c/src/libchip/ide/ata.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 322488a822..ddff967490 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-18 Chris Johns <chrisj@rtems.org>
+
+ * libchip/i2c/spi-sd-card.c, libchip/ide/ata.c: PR
+ 1448/filesystem.
+
2010-05-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* aclocal/bsp-alias.m4: Change quoting to work-round
diff --git a/c/src/libchip/i2c/spi-sd-card.c b/c/src/libchip/i2c/spi-sd-card.c
index 11380952d7..b1a736d3c7 100644
--- a/c/src/libchip/i2c/spi-sd-card.c
+++ b/c/src/libchip/i2c/spi-sd-card.c
@@ -1134,7 +1134,7 @@ static int sd_card_disk_ioctl( rtems_disk_device *dd, uint32_t req, void *arg)
errno = EINVAL;
return -1;
}
- } else if (req == RTEMS_BLKDEV_CAPABILITIES) {
+ } else if (req == RTEMS_BLKIO_CAPABILITIES) {
*(uint32_t *) arg = RTEMS_BLKDEV_CAP_MULTISECTOR_CONT;
return 0;
} else {
diff --git a/c/src/libchip/ide/ata.c b/c/src/libchip/ide/ata.c
index 8942aee63d..362c59965a 100644
--- a/c/src/libchip/ide/ata.c
+++ b/c/src/libchip/ide/ata.c
@@ -1019,7 +1019,7 @@ ata_ioctl(rtems_disk_device *dd, uint32_t cmd, void *argp)
status = ata_non_data_request(device, cmd, argp);
break;
- case RTEMS_BLKDEV_CAPABILITIES:
+ case RTEMS_BLKIO_CAPABILITIES:
*((uint32_t*) argp) = RTEMS_BLKDEV_CAP_MULTISECTOR_CONT;
status = RTEMS_SUCCESSFUL;
break;