diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/video/offb.c | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/video/offb.c')
| -rw-r--r-- | drivers/video/offb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index 61ca90517..edeeae447 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c @@ -470,8 +470,7 @@ static int __init offb_init_driver(struct device_node *dp) } #endif /* CONFIG_FB_PLATINUM */ #ifdef CONFIG_FB_CLGEN - if ((!strncmp(dp->name, "MacPicasso",10) || - (!strncmp(dp->name, "54m30",5)) { + if (!strncmp(dp->name, "MacPicasso",10) || !strncmp(dp->name, "54m30",5)) { clgen_of_init(dp); return 1; } |