From 01e0451a08e0afb9af04783c320d70084cf4e574 Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 25 Aug 2011 14:39:18 -0500
Subject: Revert "Merge remote-tracking branch 'qemu-kvm/memory/batch' into
 staging"

This reverts commit 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d, reversing
changes made to 444dc48298c480e42e15a8fe676be737d8a6b2a1.

From Avi:

  Please revert the entire pull (git revert 8ef9ea85a2cc1) while I work this
  out - it isn't trivial.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 Makefile.hw | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Makefile.hw')

diff --git a/Makefile.hw b/Makefile.hw
index 63eb7e4..659e441 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -10,7 +10,6 @@ include $(SRC_PATH)/rules.mak
 $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)
 
 QEMU_CFLAGS+=-I..
-QEMU_CFLAGS += $(GLIB_CFLAGS)
 
 include $(SRC_PATH)/Makefile.objs
 
-- 
cgit v1.1