diff options
author | Paul Mackerras <paulus@samba.org> | 2008-05-23 10:53:23 +0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 10:53:23 +0400 |
commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /drivers/video/hpfb.c | |
parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
download | linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.xz |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'drivers/video/hpfb.c')
-rw-r--r-- | drivers/video/hpfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c index 2eb4fb159084..b8ebff1e8493 100644 --- a/drivers/video/hpfb.c +++ b/drivers/video/hpfb.c @@ -382,7 +382,7 @@ int __init hpfb_init(void) #define INTFBPADDR 0x560000 if (!MACH_IS_HP300) - return -ENXIO; + return -ENODEV; if (fb_get_options("hpfb", NULL)) return -ENODEV; |