diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-06 12:19:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-06 12:19:38 -0700 |
commit | 18b15fcde715a5512671af9d72a76e7f6d7cb6f0 (patch) | |
tree | 073ca0c45f48abae1809e86efc06e22e7528f0e7 /include | |
parent | 271fd5d7286eb931142402c170943d14640bb922 (diff) | |
parent | ab27a20e6212cd1d96d813352b47e1fc1cfd01db (diff) | |
download | linux-3.10-18b15fcde715a5512671af9d72a76e7f6d7cb6f0.tar.gz linux-3.10-18b15fcde715a5512671af9d72a76e7f6d7cb6f0.tar.bz2 linux-3.10-18b15fcde715a5512671af9d72a76e7f6d7cb6f0.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes form Peter Anvin
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver
x86, relocs: Remove an unused variable
asm-generic: Use __BITS_PER_LONG in statfs.h
x86/amd: Re-enable CPU topology extensions in case BIOS has disabled it
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/statfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/statfs.h b/include/asm-generic/statfs.h index 0fd28e028de..c749af9c098 100644 --- a/include/asm-generic/statfs.h +++ b/include/asm-generic/statfs.h @@ -15,7 +15,7 @@ typedef __kernel_fsid_t fsid_t; * with a 10' pole. */ #ifndef __statfs_word -#if BITS_PER_LONG == 64 +#if __BITS_PER_LONG == 64 #define __statfs_word long #else #define __statfs_word __u32 |