diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 10:38:13 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 10:38:13 +0000 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /tools/vm/page-types.c | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
| download | op-kernel-dev-851462444d421c223965b12b836bef63da61b57f.zip op-kernel-dev-851462444d421c223965b12b836bef63da61b57f.tar.gz | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'tools/vm/page-types.c')
| -rw-r--r-- | tools/vm/page-types.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c index f576971..b76edf2 100644 --- a/tools/vm/page-types.c +++ b/tools/vm/page-types.c @@ -34,8 +34,8 @@ #include <sys/fcntl.h> #include <sys/mount.h> #include <sys/statfs.h> -#include "../../include/linux/magic.h" -#include "../../include/linux/kernel-page-flags.h" +#include "../../include/uapi/linux/magic.h" +#include "../../include/uapi/linux/kernel-page-flags.h" #ifndef MAX_PATH |
