diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
| commit | b21a207141d83a06abc5f492b80204602e02ca44 (patch) | |
| tree | f0152cde543008c72d7eb5c12c18095ad92785e6 /include/linux/fdtable.h | |
| parent | 3af373021fa32f8f787bfbdcc1a9277a287bde4e (diff) | |
| parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.c
Diffstat (limited to 'include/linux/fdtable.h')
| -rw-r--r-- | include/linux/fdtable.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index 4aab6f12cfab..09d6c5bbdddd 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h | |||
| @@ -57,8 +57,6 @@ struct files_struct { | |||
| 57 | 57 | ||
| 58 | #define files_fdtable(files) (rcu_dereference((files)->fdt)) | 58 | #define files_fdtable(files) (rcu_dereference((files)->fdt)) |
| 59 | 59 | ||
| 60 | extern struct kmem_cache *filp_cachep; | ||
| 61 | |||
| 62 | struct file_operations; | 60 | struct file_operations; |
| 63 | struct vfsmount; | 61 | struct vfsmount; |
| 64 | struct dentry; | 62 | struct dentry; |