diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 17:04:00 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 17:04:00 +0100 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /drivers/dio/dio.c | |
| parent | [CIFS] fix warning in cifs_spnego.c (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-f315ccb3e679f271583f2a4f463ad9b65665b751.tar.xz linux-f315ccb3e679f271583f2a4f463ad9b65665b751.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/dio/dio.c')
| -rw-r--r-- | drivers/dio/dio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index 17502d6efae7..07f274f853d9 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c @@ -88,8 +88,6 @@ static struct dioname names[] = #undef DIONAME #undef DIOFBNAME -#define NUMNAMES (sizeof(names) / sizeof(struct dioname)) - static const char *unknowndioname = "unknown DIO board -- please email <linux-m68k@lists.linux-m68k.org>!"; @@ -97,7 +95,7 @@ static const char *dio_getname(int id) { /* return pointer to a constant string describing the board with given ID */ unsigned int i; - for (i = 0; i < NUMNAMES; i++) + for (i = 0; i < ARRAY_SIZE(names); i++) if (names[i].id == id) return names[i].name; |