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

[net-next-2.6.git] / drivers / net / b44.h

diff --git a/drivers/net/b44.h b/drivers/net/b44.h
index 0443f6801f60517373d5b93cc87ba489db8887f4..e1905a49279ff584a1328eadc371284814eeacac 100644 (file)
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@ -97,7 +97,7 @@
 #define B44_DMARX_STAT 0x021CUL /* DMA RX Current Active Desc. + Status */
 #define  DMARX_STAT_CDMASK     0x00000fff /* Current Descriptor Mask */
 #define  DMARX_STAT_SMASK      0x0000f000 /* State Mask */
-#define  DMARX_STAT_SDISABLED  0x00000000 /* State Disbaled */
+#define  DMARX_STAT_SDISABLED  0x00000000 /* State Disabled */
 #define  DMARX_STAT_SACTIVE    0x00001000 /* State Active */
 #define  DMARX_STAT_SIDLE      0x00002000 /* State Idle Wait */
 #define  DMARX_STAT_SSTOPPED   0x00003000 /* State Stopped */