summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2012-02-10 20:12:27 +0100
committerRusty Russell <rusty@rustcorp.com.au>2012-02-14 11:02:15 +1030
commit0d86f65ed0b727daa06d3aa176314cd175323db6 (patch)
tree45961c1d6a931cbc88512298b5e2fd38b8cd790f
parent10f296cbfe3b93188c41463fd7a53808ebdbcbe3 (diff)
downloadlinux-3.10-0d86f65ed0b727daa06d3aa176314cd175323db6.tar.gz
linux-3.10-0d86f65ed0b727daa06d3aa176314cd175323db6.tar.bz2
linux-3.10-0d86f65ed0b727daa06d3aa176314cd175323db6.zip
module: fix broken isapnp handling in file2alias
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>
-rw-r--r--scripts/mod/file2alias.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e8c96957776..d0de2a2c3a2 100644
--- 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("isapnp", struct isapnp_device_id, do_isapnp_entry);
/*
* Append a match expression for a single masked hex digit.