intel/gma: consolidate vbt code

Change-Id: I80b7facfb9cc9f642dd1c766884dc23da1aab2c8
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/6800
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

src/mainboard/google/link/i915.c

@@ -236,8 +236,8 @@ static int run(int index)
 	return i+1;
 }
 
-int i915lightup(const struct northbridge_intel_sandybridge_config *info,
-		u32 pphysbase, u16 piobase, u32 pmmio, u32 pgfx)
+int i915lightup_sandy(const struct i915_gpu_controller_info *info,
+		      u32 pphysbase, u16 piobase, u32 pmmio, u32 pgfx)
 {
 	static struct edid edid;
 	int edid_ok;

src/mainboard/google/link/i915io.c

@@ -18,6 +18,7 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include "i915io.h"
 
 struct iodef iodefs[] = {