diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /drivers/video/dnfb.c | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'drivers/video/dnfb.c')
| -rw-r--r-- | drivers/video/dnfb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c index b083ea7e9c69..606da043f4b4 100644 --- a/drivers/video/dnfb.c +++ b/drivers/video/dnfb.c | |||
| @@ -284,6 +284,9 @@ int __init dnfb_init(void) | |||
| 284 | { | 284 | { |
| 285 | int ret; | 285 | int ret; |
| 286 | 286 | ||
| 287 | if (!MACH_IS_APOLLO) | ||
| 288 | return -ENODEV; | ||
| 289 | |||
| 287 | if (fb_get_options("dnfb", NULL)) | 290 | if (fb_get_options("dnfb", NULL)) |
| 288 | return -ENODEV; | 291 | return -ENODEV; |
| 289 | 292 | ||