diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-11-29 22:34:28 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-11-29 22:34:28 +0300 |
| commit | b746a1a2860f4a918f32d10dc569115d282aaf2f (patch) | |
| tree | 4b30e6ff28e2783c73a1b763e819f5b41414563c /fs/ceph/Makefile | |
| parent | 8725aa4fa7ded30211ebd28bb1c9bae806eb3841 (diff) | |
| parent | b03e5774d51fe003e1020060c403a1d085b128eb (diff) | |
| download | linux-b746a1a2860f4a918f32d10dc569115d282aaf2f.tar.xz | |
Merge branch 'for-5.5/core' into for-linus
- hid_have_special_driver[] cleanup for LED devices (Heiner Kallweit)
- HID parser improvements (Blaž Hrastnik, Candle Sun)
Diffstat (limited to 'fs/ceph/Makefile')
| -rw-r--r-- | fs/ceph/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/Makefile b/fs/ceph/Makefile index a699e320393f..c1da294418d1 100644 --- a/fs/ceph/Makefile +++ b/fs/ceph/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_CEPH_FS) += ceph.o ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ - export.o caps.o snap.o xattr.o quota.o \ + export.o caps.o snap.o xattr.o quota.o io.o \ mds_client.o mdsmap.o strings.o ceph_frag.o \ debugfs.o |