diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 16:59:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 16:59:05 -0700 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /include/asm-blackfin/statfs.h | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'include/asm-blackfin/statfs.h')
| -rw-r--r-- | include/asm-blackfin/statfs.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-blackfin/statfs.h b/include/asm-blackfin/statfs.h deleted file mode 100644 index 350672091ba..00000000000 --- a/include/asm-blackfin/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _BFIN_STATFS_H -#define _BFIN_STATFS_H - -#include <asm-generic/statfs.h> - -#endif /* _BFIN_STATFS_H */ |