From 85c6a2740cd59db945f48dbfe6c46b1d644e93f2 Mon Sep 17 00:00:00 2001 From: Kars de Jong Date: Sun, 25 Sep 2005 14:39:46 +0200 Subject: [PATCH] --- yaml --- r: 9315 b: refs/heads/master c: 4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd h: refs/heads/master i: 9313: 92622c6f59c127eaa1b1c8edc0627e2caeae1eca 9311: edf2b39c0f19d229f6cbd7ce090e592082be7fb8 v: v3 --- [refs] | 2 +- trunk/include/linux/mod_devicetable.h | 5 +++-- trunk/scripts/mod/file2alias.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 60e25f9f06c5..5de3f21b7a8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2570b746484cfddf4b7b4715dbb69d53d5284f4d +refs/heads/master: 4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h index 47da39ba3f03..4ed2107bc020 100644 --- a/trunk/include/linux/mod_devicetable.h +++ b/trunk/include/linux/mod_devicetable.h @@ -209,10 +209,11 @@ struct pcmcia_device_id { /* for real multi-function devices */ __u8 function; - /* for pseude multi-function devices */ + /* for pseudo multi-function devices */ __u8 device_no; - __u32 prod_id_hash[4]; + __u32 prod_id_hash[4] + __attribute__((aligned(sizeof(__u32)))); /* not matched against in kernelspace*/ #ifdef __KERNEL__ diff --git a/trunk/scripts/mod/file2alias.c b/trunk/scripts/mod/file2alias.c index d8ee38aede26..f2ee673329a7 100644 --- a/trunk/scripts/mod/file2alias.c +++ b/trunk/scripts/mod/file2alias.c @@ -295,11 +295,13 @@ static int do_pcmcia_entry(const char *filename, { unsigned int i; + id->match_flags = TO_NATIVE(id->match_flags); id->manf_id = TO_NATIVE(id->manf_id); id->card_id = TO_NATIVE(id->card_id); id->func_id = TO_NATIVE(id->func_id); id->function = TO_NATIVE(id->function); id->device_no = TO_NATIVE(id->device_no); + for (i=0; i<4; i++) { id->prod_id_hash[i] = TO_NATIVE(id->prod_id_hash[i]); }