diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-03 19:52:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-03 19:52:23 +1000 |
| commit | 29bb0900c4032a1317f07e7bb1b28c23704fd109 (patch) | |
| tree | 8b98e6605155d5e77c72d626087db8a25f96dd8a /drivers/staging/meilhaus/me1400_device.h | |
| parent | 13ff8a17e5ee76e8091ace29dfc96eb0b618fd79 (diff) | |
| parent | d061b26c40e9d5da42a02eaf55a9571a58406f00 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/meilhaus/me1400_device.h')
| -rw-r--r-- | drivers/staging/meilhaus/me1400_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/meilhaus/me1400_device.h b/drivers/staging/meilhaus/me1400_device.h index 6215b250047d..d20112d8da60 100644 --- a/drivers/staging/meilhaus/me1400_device.h +++ b/drivers/staging/meilhaus/me1400_device.h @@ -60,7 +60,7 @@ static me1400_version_t me1400_versions[] = { {0} }; -#define ME1400_DEVICE_VERSIONS (sizeof(me1400_versions) / sizeof(me1400_version_t) - 1) /**< Returns the number of entries in #me1400_versions. */ +#define ME1400_DEVICE_VERSIONS (ARRAY_SIZE(me1400_versions) - 1) /**< Returns the number of entries in #me1400_versions. */ /** * @brief Returns the index of the device entry in #me1400_versions. |