diff options
| author | Jiri Kosina | 2011-11-13 20:55:35 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2011-11-13 20:55:53 +0100 |
| commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
| tree | e075e4d5534193f28e6059904f61e5ca03958d3c /arch/powerpc/include/asm/compat.h | |
| parent | crypto: drop selects of bogus Kconfig symbol (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | kernel-qcow2-linux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.tar.gz kernel-qcow2-linux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.tar.xz kernel-qcow2-linux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.zip | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'arch/powerpc/include/asm/compat.h')
| -rw-r--r-- | arch/powerpc/include/asm/compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h index 91010e8f8479..88e602f6430d 100644 --- a/arch/powerpc/include/asm/compat.h +++ b/arch/powerpc/include/asm/compat.h @@ -100,7 +100,8 @@ struct compat_statfs { compat_fsid_t f_fsid; int f_namelen; /* SunOS ignores this field. */ int f_frsize; - int f_spare[5]; + int f_flags; + int f_spare[4]; }; #define COMPAT_RLIM_OLD_INFINITY 0x7fffffff |