diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-01 16:56:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-01 17:07:38 -0700 |
| commit | 1ba2eaaacd2cb3e3e0d753d62dae515c6dec8035 (patch) | |
| tree | f75d444520e879f95e264d273ba8619021bd308f /drivers/md/md.h | |
| parent | 73069883c017d454737d07a5aeab2b1639fcfeca (diff) | |
| parent | 44f73dc42c11398d7b84e94365a485ebd6420798 (diff) | |
| download | linux-1ba2eaaacd2cb3e3e0d753d62dae515c6dec8035.tar.bz2 | |
Merge tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.12
Fix the interrupt description of the crypto node for device tree of
the Armada 7K/8K SoCs
* tag 'mvebu-fixes-4.12-1' of git://git.infradead.org/linux-mvebu: (316 commits)
arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
+ Linux 4.12-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/md/md.h')
| -rw-r--r-- | drivers/md/md.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.h b/drivers/md/md.h index 4e75d121bfcc..11f15146ce51 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -665,7 +665,7 @@ extern int sync_page_io(struct md_rdev *rdev, sector_t sector, int size, bool metadata_op); extern void md_do_sync(struct md_thread *thread); extern void md_new_event(struct mddev *mddev); -extern int md_allow_write(struct mddev *mddev); +extern void md_allow_write(struct mddev *mddev); extern void md_wait_for_blocked_rdev(struct md_rdev *rdev, struct mddev *mddev); extern void md_set_array_sectors(struct mddev *mddev, sector_t array_sectors); extern int md_check_no_bitmap(struct mddev *mddev); |