diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-03-26 20:03:16 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-03-26 20:04:28 +1100 |
| commit | df60f57684529a1dde4461cf84354453b440806a (patch) | |
| tree | 618f030f673980a4c9d6bf27c1db50459a3b99d1 /arch/powerpc/include/asm/opal.h | |
| parent | 605f30205348f1d808d98d77505149da8b047b9f (diff) | |
| parent | b921e90260cec1e04988bb3763491de885b67b51 (diff) | |
Merge branch 'next-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into test
Merge miscellaneous bits from benh. Fix a minor conflict with
OpalMessageType changing names to opal_msg_type.
Diffstat (limited to 'arch/powerpc/include/asm/opal.h')
| -rw-r--r-- | arch/powerpc/include/asm/opal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index 0ef0fd660ac6..c08de77f398a 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -210,6 +210,8 @@ extern int opal_notifier_unregister(struct notifier_block *nb); extern int opal_message_notifier_register(enum opal_msg_type msg_type, struct notifier_block *nb); +extern int opal_message_notifier_unregister(enum opal_msg_type msg_type, + struct notifier_block *nb); extern void opal_notifier_enable(void); extern void opal_notifier_disable(void); extern void opal_notifier_update_evt(uint64_t evt_mask, uint64_t evt_val); |