diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /arch/sparc64/prom/p1275.c | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'arch/sparc64/prom/p1275.c')
| -rw-r--r-- | arch/sparc64/prom/p1275.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c index 7fcccc0e19cf..4b7c937bba61 100644 --- a/arch/sparc64/prom/p1275.c +++ b/arch/sparc64/prom/p1275.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: p1275.c,v 1.22 2001/10/18 09:40:00 davem Exp $ | 1 | /* |
| 2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines | 2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |