Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

1 files changed, 0 insertions, 47 deletions

diff --git a/arch/arm/include/asm/attrib_alloc.h b/arch/arm/include/asm/attrib_alloc.h
deleted file mode 100644
index bd21761810f5..000000000000
--- a/arch/arm/include/asm/attrib_alloc.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * arch/arm/include/asm/attrib_alloc.h
- *
- * Page allocator with custom cache attributes
- *
- * Copyright (c) 2010, NVIDIA Corporation.
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#ifndef __ARCH_ARM_ATTRIB_ALLOC_H
-#define __ARCH_ARM_ATTRIB_ALLOC_H
-
-#include <linux/types.h>
-#include <asm/page.h>
-
-struct page *arm_attrib_alloc_pages_exact_node(int nid, gfp_t gfp,
-					       size_t size, pgprot_t prot);
-
-void arm_attrib_free_pages_exact(struct page *page, size_t size);
-
-static inline
-struct page *arm_attrib_alloc_pages_exact(gfp_t gfp, size_t size,
-					  pgprot_t prot)
-{
-	return arm_attrib_alloc_pages_exact_node(-1, gfp, size, prot);
-}
-
-#define arm_attrib_alloc_page(gfp, prot)	\
-	arm_attrib_alloc_pages_exact((gfp), PAGE_SIZE, (prot))
-
-#define arm_attrib_free_page(page)		\
-	arm_attrib_free_pages_exact((page), PAGE_SIZE)
-
-#endif /* __ARCH_ARM_ATTRIB_ALLOC_H */