Fix broken build after merge 'origin/p-android-omap-3.0-dev' into HEAD

The commit 966296d made a regression that is fixed in this patch Change-Id: I35693581a382d55cfa234c99da3a6df9019b8cfa Signed-off-by: Ruslan Bilovol <[email protected]>
uejji · Jun 29, 2012 · a6c56ba · a6c56ba
1 parent 966296d
commit a6c56ba
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 61 deletions.
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
@@ -1172,9 +1172,6 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
 		break;
 
 	case CPUFREQ_GOV_STOP:
-		/* boost timer */
-		del_timer_sync(&boost_timer);
-
 		for_each_cpu(j, policy->cpus) {
 			pcpu = &per_cpu(cpuinfo, j);
 			pcpu->governor_enabled = 0;

diff --git a/drivers/misc/gcx/gcioctl/gcif.c b/drivers/misc/gcx/gcioctl/gcif.c
@@ -830,45 +830,6 @@ static int gc_callback_wait(struct gccmdcallbackwait *gccmdcallbackwait)
 	return ret;
 }
 
-static int gc_cache_wrapper(struct bvcachexfer *bvcachexfer)
-{
-	int ret = 0;
-	struct bvcachexfer xfer;
-
-	/* Get IOCTL parameters. */
-	if (copy_from_user(&xfer, bvcachexfer,
-			sizeof(struct bvcachexfer))) {
-		GCERR("failed to read data.\n");
-		goto exit;
-	}
-
-	switch (xfer.dir) {
-
-	case DMA_FROM_DEVICE:
-		c2dm_l2cache(xfer.count, (struct c2dmrgn *)&xfer.rgn,
-				xfer.dir);
-		c2dm_l1cache(xfer.count, (struct c2dmrgn *)&xfer.rgn,
-				xfer.dir);
-		break;
-	case DMA_TO_DEVICE:
-		c2dm_l1cache(xfer.count, (struct c2dmrgn *)&xfer.rgn,
-				xfer.dir);
-		c2dm_l2cache(xfer.count, (struct c2dmrgn *)&xfer.rgn,
-				xfer.dir);
-		break;
-	case DMA_BIDIRECTIONAL:
-		c2dm_l1cache(xfer.count, (struct c2dmrgn *)&xfer.rgn,
-				xfer.dir);
-		c2dm_l2cache(xfer.count, (struct c2dmrgn *)&xfer.rgn,
-				xfer.dir);
-		break;
-	}
-
-exit:
-	return ret;
-
-}
-
 /*******************************************************************************
  * Device definitions/operations.
  */
@@ -950,27 +911,8 @@ static const struct file_operations dev_operations = {
 /*******************************************************************************
  * Device init/cleanup.
  */
-
-static int mod_init(void);
 static void mod_exit(void);
 
-static struct platform_driver gcx_drv = {
-	.probe = 0,
-	.driver = {
-		.owner = THIS_MODULE,
-		.name = "gcx",
-	},
-};
-
-static const char *gcx_version = VER_FILEVERSION_STR;
-
-static ssize_t show_version(struct device_driver *driver, char *buf)
-{
-	return scnprintf(buf, PAGE_SIZE, "%s\n", gcx_version);
-}
-
-static DRIVER_ATTR(version, 0444, show_version, NULL);
-
 static int mod_init(void)
 {
 	int ret = 0;