Merge commit 'origin/HEAD' into test-merge
[linux-2.6] / include / asm-sparc64 / prom.h
1 #include <asm-sparc/prom.h>