Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / include / linux / wimax / i2400m.h

diff --git a/include/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h
index d5148a7889a6350f43b4bae0ae757545fd1621e6..433693ef2bb083c0b81cf1bb5fa49625ef0045c6 100644 (file)
--- 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