From 281e3bee4b2e104135c75ccc446b4eff34eeae65 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 19 Jan 2011 02:56:06 -0800
Subject: [PATCH] glsl, i965: Remove unnecessary talloc includes.

These are already picked up by ir.h or glsl_types.h.

(cherry picked from commit e256e4743c3f8f924f0d191759d9428f33f3e329)
---
 src/glsl/ir_reader.cpp                            | 4 ----
 src/glsl/link_functions.cpp                       | 4 ----
 src/glsl/linker.cpp                               | 4 ----
 src/mesa/drivers/dri/i965/brw_fs.cpp              | 1 -
 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 1 -
 5 files changed, 14 deletions(-)

diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index 5a718d3b756..c44ccee0e1a 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -23,10 +23,6 @@
 
 #include <cstdarg>
 
-extern "C" {
-#include <talloc.h>
-}
-
 #include "ir_reader.h"
 #include "glsl_parser_extras.h"
 #include "glsl_types.h"
diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp
index 6f3a9ff6711..861fa39b51e 100644
--- a/src/glsl/link_functions.cpp
+++ b/src/glsl/link_functions.cpp
@@ -25,10 +25,6 @@
 #include <cstdio>
 #include <cstdarg>
 
-extern "C" {
-#include <talloc.h>
-}
-
 #include "main/core.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 88a214facef..bf7a56353ad 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -68,10 +68,6 @@
 #include <cstdarg>
 #include <climits>
 
-extern "C" {
-#include <talloc.h>
-}
-
 #include "main/core.h"
 #include "glsl_symbol_table.h"
 #include "ir.h"
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index dfc95d89ab3..c55aee03215 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -41,7 +41,6 @@ extern "C" {
 #include "brw_context.h"
 #include "brw_eu.h"
 #include "brw_wm.h"
-#include "talloc.h"
 }
 #include "brw_fs.h"
 #include "../glsl/glsl_types.h"
diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
index bbb210cd449..954a9fa882f 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
@@ -41,7 +41,6 @@ extern "C" {
 #include "brw_context.h"
 #include "brw_eu.h"
 #include "brw_wm.h"
-#include "talloc.h"
 }
 #include "brw_fs.h"
 #include "../glsl/glsl_types.h"