git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
include
/
linux
/
edac.h
diff --git
a/include/linux/edac.h
b/include/linux/edac.h
index
7cf92e8
..
36c6644
100644
(file)
--- a/
include/linux/edac.h
+++ b/
include/linux/edac.h
@@
-13,6
+13,7
@@
#define _LINUX_EDAC_H_
#include <asm/atomic.h>
#define _LINUX_EDAC_H_
#include <asm/atomic.h>
+#include <linux/sysdev.h>
#define EDAC_OPSTATE_INVAL -1
#define EDAC_OPSTATE_POLL 0
#define EDAC_OPSTATE_INVAL -1
#define EDAC_OPSTATE_POLL 0
@@
-22,9
+23,12
@@
extern int edac_op_state;
extern int edac_err_assert;
extern atomic_t edac_handlers;
extern int edac_op_state;
extern int edac_err_assert;
extern atomic_t edac_handlers;
+extern struct sysdev_class edac_class;
extern int edac_handler_set(void);
extern void edac_atomic_assert_error(void);
extern int edac_handler_set(void);
extern void edac_atomic_assert_error(void);
+extern struct sysdev_class *edac_get_sysfs_class(void);
+extern void edac_put_sysfs_class(void);
static inline void opstate_init(void)
{
static inline void opstate_init(void)
{