Merge with 2.3.48.

1 files changed, 15 insertions, 45 deletions

diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 7502ad08e..5a57ba8a2 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -733,17 +733,13 @@ void ppc_generic_ide_fix_driveid(struct hd_driveid *id)
 	id->eide_dma_time  = __le16_to_cpu(id->eide_dma_time);
 	id->eide_pio       = __le16_to_cpu(id->eide_pio);
 	id->eide_pio_iordy = __le16_to_cpu(id->eide_pio_iordy);
-	id->word69         = __le16_to_cpu(id->word69);
-	id->word70         = __le16_to_cpu(id->word70);
-	id->word71         = __le16_to_cpu(id->word71);
-	id->word72         = __le16_to_cpu(id->word72);
-	id->word73         = __le16_to_cpu(id->word73);
-	id->word74         = __le16_to_cpu(id->word74);
+	for (i=0; i<2 i++)
+		id->words69_70[i] = __le16_to_cpu(id->words69_70[i]);
+        for (i=0; i<4 i++)
+                id->words71_74[i] = __le16_to_cpu(id->words71_74[i]);
 	id->queue_depth	   = __le16_to_cpu(id->queue_depth);
-	id->word76         = __le16_to_cpu(id->word76);
-	id->word77         = __le16_to_cpu(id->word77);
-	id->word78         = __le16_to_cpu(id->word78);
-	id->word79         = __le16_to_cpu(id->word79);
+	for (i=0; i<4 i++)
+		id->words76_79[i] = __le16_to_cpu(id->words76_79[i]);
 	id->major_rev_num  = __le16_to_cpu(id->major_rev_num);
 	id->minor_rev_num  = __le16_to_cpu(id->minor_rev_num);
 	id->command_set_1  = __le16_to_cpu(id->command_set_1);
@@ -758,40 +754,14 @@ void ppc_generic_ide_fix_driveid(struct hd_driveid *id)
 	id->CurAPMvalues   = __le16_to_cpu(id->CurAPMvalues);
 	id->word92         = __le16_to_cpu(id->word92);
 	id->hw_config      = __le16_to_cpu(id->hw_config);
-	id->word94         = __le16_to_cpu(id->word94);
-	id->word95         = __le16_to_cpu(id->word95);
-	id->word96         = __le16_to_cpu(id->word96);
-	id->word97         = __le16_to_cpu(id->word97);
-	id->word98         = __le16_to_cpu(id->word98);
-	id->word99         = __le16_to_cpu(id->word99);
-	id->word100        = __le16_to_cpu(id->word100);
-	id->word101        = __le16_to_cpu(id->word101);
-	id->word102        = __le16_to_cpu(id->word102);
-	id->word103        = __le16_to_cpu(id->word103);
-	id->word104        = __le16_to_cpu(id->word104);
-	id->word105        = __le16_to_cpu(id->word105);
-	id->word106        = __le16_to_cpu(id->word106);
-	id->word107        = __le16_to_cpu(id->word107);
-	id->word108        = __le16_to_cpu(id->word108);
-	id->word109        = __le16_to_cpu(id->word109);
-	id->word110        = __le16_to_cpu(id->word110);
-	id->word111        = __le16_to_cpu(id->word111);
-	id->word112        = __le16_to_cpu(id->word112);
-	id->word113        = __le16_to_cpu(id->word113);
-	id->word114        = __le16_to_cpu(id->word114);
-	id->word115        = __le16_to_cpu(id->word115);
-	id->word116        = __le16_to_cpu(id->word116);
-	id->word117        = __le16_to_cpu(id->word117);
-	id->word118        = __le16_to_cpu(id->word118);
-	id->word119        = __le16_to_cpu(id->word119);
-	id->word120        = __le16_to_cpu(id->word120);
-	id->word121        = __le16_to_cpu(id->word121);
-	id->word122        = __le16_to_cpu(id->word122);
-	id->word123        = __le16_to_cpu(id->word123);
-	id->word124        = __le16_to_cpu(id->word124);
-	id->word125        = __le16_to_cpu(id->word125);
-	id->word126        = __le16_to_cpu(id->word126);
+	for (i=0; i<34; i++)
+		id->words94_125[i]  = __le16_to_cpu(id->words94_125[i]);
+	id->last_lun       = __le16_to_cpu(id->last_lun);
 	id->word127        = __le16_to_cpu(id->word127);
-	for (i=0; i<127; i++)
-	        id->reserved[i] = __le16_to_cpu(id->reserved[i]);
+	id->dlf            = __le16_to_cpu(id->dlf);
+	id->csfo           = __le16_to_cpu(id->csfo);
+	for (i=0; i<31; i++)
+		id->words130_159[i] = __le16_to_cpu(id->words130_159[i]);
+	for (i=0; i<97; i++)
+		id->words160_255[i] = __le16_to_cpu(id->words160_255[i]);
 }