diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-05 10:00:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-05 10:00:14 -0800 |
| commit | 1fbd55c0ccd842a976d16431b57121b7892ed8ce (patch) | |
| tree | e5a089c85d00379a301d8db492b07321c078ce48 /include/linux | |
| parent | 73996933b53ff396d63a7fccd8e824758634dc19 (diff) | |
| parent | 0946b2fb38fdb6585a5ac3ca84ac73924f645952 (diff) | |
Merge tag 'driver-core-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are 3 small fixes for some reported issues:
- a debugfs build error that lots of people have reported
- a Kconfig help text cleanup now that the firmware is not in the
kernel tree
- an ISA bus bug fix for a reported issue that has been there since
2.6.18.
All of these have been in linux-next with no reported issues"
* tag 'driver-core-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
firmware: cleanup FIRMWARE_IN_KERNEL message
isa: Prevent NULL dereference in isa_bus driver callbacks
debugfs: fix debugfs_real_fops() build error
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/debugfs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index f36ecc2a5712..3b0ba54cc4d5 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h @@ -216,6 +216,8 @@ static inline void debugfs_remove(struct dentry *dentry) static inline void debugfs_remove_recursive(struct dentry *dentry) { } +const struct file_operations *debugfs_real_fops(const struct file *filp); + static inline int debugfs_file_get(struct dentry *dentry) { return 0; |