From f6cf55c518867216b4636dcd0eaa26f004968def Mon Sep 17 00:00:00 2001 From: eric miao Date: Thu, 24 Jan 2008 02:27:30 +0100 Subject: [PATCH] --- yaml --- r: 77412 b: refs/heads/master c: 6232be32afa121628c72291ce7eaa24a639905c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/pxa3xx.c | 2 +- trunk/drivers/ata/libata-core.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 055456c3c045..e8166501a75a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0affa456cb6da51a31a6dd76b3d8827f467f807d +refs/heads/master: 6232be32afa121628c72291ce7eaa24a639905c2 diff --git a/trunk/arch/arm/mach-pxa/pxa3xx.c b/trunk/arch/arm/mach-pxa/pxa3xx.c index 61d9c9d69e6b..37e93f9ba8fc 100644 --- a/trunk/arch/arm/mach-pxa/pxa3xx.c +++ b/trunk/arch/arm/mach-pxa/pxa3xx.c @@ -86,7 +86,7 @@ unsigned int pxa3xx_get_clk_frequency_khz(int info) HSS / 1000000, (HSS % 1000000) / 10000); } - return CLK; + return CLK / 1000; } /* diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index bdbd55af7022..ce803d18e96a 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -4924,7 +4924,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) * @dev: device to target * @buf: data buffer * @buflen: buffer length - * @rw: read/write + * @write_data: read/write * * Transfer data from/to the device data register by PIO. * @@ -4970,7 +4970,7 @@ unsigned int ata_data_xfer(struct ata_device *dev, unsigned char *buf, * @dev: device to target * @buf: data buffer * @buflen: buffer length - * @rw: read/write + * @write_data: read/write * * Transfer data from/to the device data register by PIO. Do the * transfer with interrupts disabled.