diff options
| author | David S. Miller | 2009-06-12 02:11:33 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-06-12 02:11:33 +0200 |
| commit | 3ee40c376ad3252d13946141588db7e2f435f958 (patch) | |
| tree | 65bd16c024edab1ff74ad165779443edfaa26467 /include/linux | |
| parent | mISDN: cleanup mISDNhw.h (diff) | |
| parent | wimax: fix gcc warnings in sh4 when calling BUG() (diff) | |
| download | kernel-qcow2-linux-3ee40c376ad3252d13946141588db7e2f435f958.tar.gz kernel-qcow2-linux-3ee40c376ad3252d13946141588db7e2f435f958.tar.xz kernel-qcow2-linux-3ee40c376ad3252d13946141588db7e2f435f958.zip | |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/wimax/i2400m.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h index d5148a7889a6..433693ef2bb0 100644 --- a/include/linux/wimax/i2400m.h +++ b/include/linux/wimax/i2400m.h @@ -266,7 +266,7 @@ enum i2400m_ro_type { /* Misc constants */ enum { - I2400M_PL_PAD = 16, /* Payload data size alignment */ + I2400M_PL_ALIGN = 16, /* Payload data size alignment */ I2400M_PL_SIZE_MAX = 0x3EFF, I2400M_MAX_PLS_IN_MSG = 60, /* protocol barkers: sync sequences; for notifications they |