Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / agp.h

diff --git a/include/asm-powerpc/agp.h b/include/asm-powerpc/agp.h
index ca9e423307f4c881f177260b83b390cebb61a1ff..86455c4c31eea851f84b73ddbdc126581ff49c92 100644 (file)
--- a/include/asm-powerpc/agp.h
+++ b/include/asm-powerpc/agp.h
@@ -1,13 +1,11 @@
-#ifndef AGP_H
-#define AGP_H 1
+#ifndef _ASM_POWERPC_AGP_H
+#define _ASM_POWERPC_AGP_H
+#ifdef __KERNEL__
 
 #include <asm/io.h>
 
-/* nothing much needed here */
-
 #define map_page_into_agp(page)
 #define unmap_page_from_agp(page)
-#define flush_agp_mappings()
 #define flush_agp_cache() mb()
 
 /* Convert a physical address to an address suitable for the GART. */
@@ -20,4 +18,5 @@
 #define free_gatt_pages(table, order)  \
        free_pages((unsigned long)(table), (order))
 
-#endif
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_AGP_H */