diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 10:28:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 10:28:26 +0300 |
| commit | bfc1de0c40a26c6daa46c297e28138aecb4c5664 (patch) | |
| tree | 5ac390e4c790076fda0644dd8b583ca819051905 /include/asm-sparc64/bugs.h | |
| parent | 1712a699ab32d4952fe6b0f97af91b8230bece98 (diff) | |
| parent | e88bb41595ad67a8e7d5dd8c7bbeea2e66cc0cac (diff) | |
| download | linux-bfc1de0c40a26c6daa46c297e28138aecb4c5664.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (24 commits)
[SPARC]: Add solaris/sunos binary support to feature removal schedule.
[SPARC]: Merge asm-sparc{,64}/a.out.h
[SPARC]: Merge asm-sparc{,64}/fb.h
[SPARC]: Merge asm-sparc{,64}/errno.h
[SPARC]: Merge asm-sparc{,64}/emergency-restart.h
[SPARC]: Merge asm-sparc{,64}/div64.h
[SPARC]: Merge asm-sparc{,64}/device.h
[SPARC]: Merge asm-sparc{,64}/current.h
[SPARC]: Merge asm-sparc{,64}/cputime.h
[SPARC]: Merge asm-sparc{,64}/cache.h
[SPARC]: Merge asm-sparc{,64}/byteorder.h
[SPARC]: Merge asm-sparc{,64}/bugs.h
[SPARC]: Merge asm-sparc{,64}/bug.h
[SPARC]: Kill BSD errno translation table and header files.
[SPARC]: Merge asm-sparc{,64}/bpp.h
[SPARC]: Merge include/asm-sparc{,64}/auxvec.h
[SPARC]: Merge include/asm-sparc{,64}/of_device.h
[SPARC]: Merge include/asm-sparc{,64}/prom.h
[SPARC]: Remove of_platform_device_create
[SPARC64]: Add kretprobe support.
...
Diffstat (limited to 'include/asm-sparc64/bugs.h')
| -rw-r--r-- | include/asm-sparc64/bugs.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/asm-sparc64/bugs.h b/include/asm-sparc64/bugs.h index 11ade6841971..04ae9e2818cf 100644 --- a/include/asm-sparc64/bugs.h +++ b/include/asm-sparc64/bugs.h @@ -1,10 +1 @@ -/* bugs.h: Sparc64 probes for various bugs. - * - * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net) - */ -#include <asm/sstate.h> - -static void __init check_bugs(void) -{ - sstate_running(); -} +#include <asm-sparc/bugs.h> |