diff --git a/[refs] b/[refs] index b9a02ca9eb70..68bbd6713073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0ff1f26acdbb8dc67165b0bbf910f795f0a0ca3 +refs/heads/master: 218ff137bc67252694420563d23d051ab9227f17 diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index 8d8d1977736e..9f274a687c7e 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/include/linux/mmzone.h @@ -699,7 +699,6 @@ extern char numa_zonelist_order[]; extern struct pglist_data contig_page_data; #define NODE_DATA(nid) (&contig_page_data) #define NODE_MEM_MAP(nid) mem_map -#define MAX_NODES_SHIFT 1 #else /* CONFIG_NEED_MULTIPLE_NODES */