diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/sparc/include/asm/memctrl.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/sparc/include/asm/memctrl.h')
| -rw-r--r-- | arch/sparc/include/asm/memctrl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/memctrl.h b/arch/sparc/include/asm/memctrl.h new file mode 100644 index 000000000000..4065c56af7b6 --- /dev/null +++ b/arch/sparc/include/asm/memctrl.h | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | #ifndef _SPARC_MEMCTRL_H | ||
| 2 | #define _SPARC_MEMCTRL_H | ||
| 3 | |||
| 4 | typedef int (*dimm_printer_t)(int synd_code, unsigned long paddr, char *buf, int buflen); | ||
| 5 | |||
| 6 | int register_dimm_printer(dimm_printer_t func); | ||
| 7 | void unregister_dimm_printer(dimm_printer_t func); | ||
| 8 | |||
| 9 | #endif /* _SPARC_MEMCTRL_H */ | ||