diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/linux/mtd/compatmac.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/linux/mtd/compatmac.h')
| -rw-r--r-- | include/linux/mtd/compatmac.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/mtd/compatmac.h b/include/linux/mtd/compatmac.h deleted file mode 100644 index 7d1300d9bd51..000000000000 --- a/include/linux/mtd/compatmac.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | |||
| 2 | #ifndef __LINUX_MTD_COMPATMAC_H__ | ||
| 3 | #define __LINUX_MTD_COMPATMAC_H__ | ||
| 4 | |||
| 5 | /* Nothing to see here. We write 2.5-compatible code and this | ||
| 6 | file makes it all OK in older kernels, but it's empty in _current_ | ||
| 7 | kernels. Include guard just to make GCC ignore it in future inclusions | ||
| 8 | anyway... */ | ||
| 9 | |||
| 10 | #endif /* __LINUX_MTD_COMPATMAC_H__ */ | ||