diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-05-23 11:05:26 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-05-23 11:05:59 +0200 |
| commit | dd8070bff204a67fcb6585f18047841a895b68d7 (patch) | |
| tree | cce17d4b8eb8987194beb40498c8f83e74d6799f /arch/s390/include/asm/reset.h | |
| parent | cfg80211: add missing kernel-doc (diff) | |
| parent | Merge branch 'qed-firmware-TLV' (diff) | |
| download | linux-dd8070bff204a67fcb6585f18047841a895b68d7.tar.xz linux-dd8070bff204a67fcb6585f18047841a895b68d7.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/s390/include/asm/reset.h')
| -rw-r--r-- | arch/s390/include/asm/reset.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/s390/include/asm/reset.h b/arch/s390/include/asm/reset.h deleted file mode 100644 index 6450b31ade03..000000000000 --- a/arch/s390/include/asm/reset.h +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright IBM Corp. 2006 - * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> - */ - -#ifndef _ASM_S390_RESET_H -#define _ASM_S390_RESET_H - -#include <linux/list.h> - -struct reset_call { - struct list_head list; - void (*fn)(void); -}; - -extern void register_reset_call(struct reset_call *reset); -extern void unregister_reset_call(struct reset_call *reset); -extern void s390_reset_system(void); -#endif /* _ASM_S390_RESET_H */ |