aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-26 18:31:36 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-26 18:31:36 -0700
commitbf0cbb3e4264e9d6493af757f63d4b0527d21eab (patch)
tree61903263aa73f98d0d6d7fbc77013080b0eb8856 /scripts
parent0b1556945475e8529328edf98ff0d201ed133edb (diff)
parent4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/file2alias.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index d8ee38aede2..f2ee673329a 100644
--- a/scripts/mod/file2alias.c
+++ b/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]);
}