Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-block.git] / drivers / net / wireless / orinoco / hermes_dld.c

diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/orinoco/hermes_dld.c
index 6d5660defd87143b2232bcfb7c8e95def84c5fc9..fb157eb889ca19f20d507e7933b471ba8c564385 100644 (file)
--- a/drivers/net/wireless/orinoco/hermes_dld.c
+++ b/drivers/net/wireless/orinoco/hermes_dld.c
@@ -550,7 +550,7 @@ static const struct {                                                       \
 
 #define DEFAULT_PDR(pid) default_pdr_data_##pid
 
-/*  HWIF Compatiblity */
+/*  HWIF Compatibility */
 DEFINE_DEFAULT_PDR(0x0005, 10, "\x00\x00\x06\x00\x01\x00\x01\x00\x01\x00");
 
 /* PPPPSign */
@@ -656,7 +656,7 @@ int hermes_apply_pda_with_defaults(hermes_t *hw,
                                         record_id + 1, pdi);
                        }
                        break;
-               case 0x5: /*  HWIF Compatiblity */
+               case 0x5: /*  HWIF Compatibility */
                        default_pdi = (struct pdi *) &DEFAULT_PDR(0x0005);
                        break;
                case 0x108: /* PPPPSign */