diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /include/asm-sparc64/oplib.h | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
Merge Linux 2.6.23
Diffstat (limited to 'include/asm-sparc64/oplib.h')
| -rw-r--r-- | include/asm-sparc64/oplib.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h index 86dc5c018a19..55c5bb27e4da 100644 --- a/include/asm-sparc64/oplib.h +++ b/include/asm-sparc64/oplib.h | |||
| @@ -297,11 +297,7 @@ extern void prom_sun4v_guest_soft_state(void); | |||
| 297 | extern int prom_ihandle2path(int handle, char *buffer, int bufsize); | 297 | extern int prom_ihandle2path(int handle, char *buffer, int bufsize); |
| 298 | 298 | ||
| 299 | /* Client interface level routines. */ | 299 | /* Client interface level routines. */ |
| 300 | extern void prom_set_trap_table(unsigned long tba); | ||
| 301 | extern void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa); | ||
| 302 | |||
| 303 | extern long p1275_cmd(const char *, long, ...); | 300 | extern long p1275_cmd(const char *, long, ...); |
| 304 | |||
| 305 | 301 | ||
| 306 | #if 0 | 302 | #if 0 |
| 307 | #define P1275_SIZE(x) ((((long)((x) / 32)) << 32) | (x)) | 303 | #define P1275_SIZE(x) ((((long)((x) / 32)) << 32) | (x)) |