projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
10f296c
)
module: fix broken isapnp handling in file2alias
author
Ondrej Zary
<linux@rainbow-software.org>
Fri, 10 Feb 2012 19:12:27 +0000
(20:12 +0100)
committer
Rusty Russell
<rusty@rustcorp.com.au>
Tue, 14 Feb 2012 00:32:15 +0000
(11:02 +1030)
Handling of isapnp module aliases was broken by commit
626596e295d477c0fefa08cd5daa7dd011b1bb2c
by changing "isapnp" string to "isa".
The code was then modified by commit
e49ce14150c64b29a8dd211df785576fa19a9858
but this bug remained.
Change the string back to "isapnp".
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
scripts/mod/file2alias.c
patch
|
blob
|
history
diff --git
a/scripts/mod/file2alias.c
b/scripts/mod/file2alias.c
index
e8c9695
..
d0de2a2
100644
(file)
--- a/
scripts/mod/file2alias.c
+++ b/
scripts/mod/file2alias.c
@@
-932,7
+932,7
@@
static int do_isapnp_entry(const char *filename,
(id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
return 1;
}
-ADD_TO_DEVTABLE("isa", struct isapnp_device_id, do_isapnp_entry);
+ADD_TO_DEVTABLE("isa
pnp
", struct isapnp_device_id, do_isapnp_entry);
/*
* Append a match expression for a single masked hex digit.