Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[powerpc.git] / drivers / block / paride / pd.c

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 9d9bff2..31e0148 100644 (file)
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -153,7 +153,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};
 #include <linux/blkpg.h>
 #include <linux/kernel.h>
 #include <asm/uaccess.h>
-#include <linux/sched.h>
 #include <linux/workqueue.h>
 
 static DEFINE_SPINLOCK(pd_lock);
@@ -664,11 +663,11 @@ static enum action pd_identify(struct pd_unit *disk)
                return Fail;
        pi_read_block(disk->pi, pd_scratch, 512);
        disk->can_lba = pd_scratch[99] & 2;
-       disk->sectors = le16_to_cpu(*(u16 *) (pd_scratch + 12));
-       disk->heads = le16_to_cpu(*(u16 *) (pd_scratch + 6));
-       disk->cylinders = le16_to_cpu(*(u16 *) (pd_scratch + 2));
+       disk->sectors = le16_to_cpu(*(__le16 *) (pd_scratch + 12));
+       disk->heads = le16_to_cpu(*(__le16 *) (pd_scratch + 6));
+       disk->cylinders = le16_to_cpu(*(__le16 *) (pd_scratch + 2));
        if (disk->can_lba)
-               disk->capacity = le32_to_cpu(*(u32 *) (pd_scratch + 120));
+               disk->capacity = le32_to_cpu(*(__le32 *) (pd_scratch + 120));
        else
                disk->capacity = disk->sectors * disk->heads * disk->cylinders;