diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 21:08:10 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 21:08:10 +0400 |
| commit | 7367f5b013fee33f7d40a5a10a39d5134f529ec8 (patch) | |
| tree | aaf1366025364174d93c1ad33c79da4fd58aa917 /include | |
| parent | ce4327d372af7e2f2d403286e9904ab012e72827 (diff) | |
| parent | a8e026c785b3fecef0ef5c00c15223542c4db8f5 (diff) | |
| download | linux-7367f5b013fee33f7d40a5a10a39d5134f529ec8.tar.xz | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
Further tidyup of raid6 naming in lib/raid6
Make lib/raid6/test build correctly.
Rename raid6 files now they're in a 'raid6' directory.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/raid/pq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index 1cbbd2c11aa9..2b59cc824395 100644 --- a/include/linux/raid/pq.h +++ b/include/linux/raid/pq.h @@ -62,7 +62,9 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; #define disable_kernel_altivec() #define EXPORT_SYMBOL(sym) +#define EXPORT_SYMBOL_GPL(sym) #define MODULE_LICENSE(licence) +#define MODULE_DESCRIPTION(desc) #define subsys_initcall(x) #define module_exit(x) #endif /* __KERNEL__ */ |