---

yaml
---
r: 172723
b: refs/heads/master
c: 72464db
h: refs/heads/master
i:
  172721: 5264b18
  172719: 260bd65
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c97c686467420f6765c7bc5bdae2b2aca141068b
+refs/heads/master: 72464dbae2749dd57bc2b3cd57d4fc6ba7abca37

trunk/arch/arm/plat-omap/include/mach/vmalloc.h → trunk/arch/arm/mach-omap1/include/mach/vmalloc.h

@@ -1,5 +1,5 @@
 /*
- *  arch/arm/plat-omap/include/mach/vmalloc.h
+ *  arch/arm/mach-omap1/include/mach/vmalloc.h
  *
  *  Copyright (C) 2000 Russell King.
  *
@@ -17,8 +17,4 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#ifdef CONFIG_ARCH_OMAP1
 #define VMALLOC_END	(PAGE_OFFSET + 0x18000000)
-#else
-#define VMALLOC_END	(PAGE_OFFSET + 0x38000000)
-#endif

trunk/arch/arm/mach-omap2/include/mach/vmalloc.h

@@ -0,0 +1,20 @@
+/*
+ *  arch/arm/plat-omap/include/mach/vmalloc.h
+ *
+ *  Copyright (C) 2000 Russell King.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#define VMALLOC_END	  (PAGE_OFFSET + 0x38000000)