Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 3eba85ed729c..95b076c18c07 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -45,10 +45,10 @@ void pnp_eisa_id_to_string(u32 id, char *str)
         str[0] = 'A' + ((id >> 26) & 0x3f) - 1;
         str[1] = 'A' + ((id >> 21) & 0x1f) - 1;
         str[2] = 'A' + ((id >> 16) & 0x1f) - 1;
-        str[3] = hex_asc((id >> 12) & 0xf);
-        str[4] = hex_asc((id >>  8) & 0xf);
-        str[5] = hex_asc((id >>  4) & 0xf);
-        str[6] = hex_asc((id >>  0) & 0xf);
+        str[3] = hex_asc_hi(id >> 8);
+        str[4] = hex_asc_lo(id >> 8);
+        str[5] = hex_asc_hi(id);
+        str[6] = hex_asc_lo(id);
         str[7] = '\0';
 }