summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorVenkata(Muni) Anda <vanda@nvidia.com>2010-03-17 22:06:50 -0700
committerGary King <gking@nvidia.com>2010-03-22 17:47:53 -0800
commit44476f826f166461d10142935ef20b23c8c010c4 (patch)
tree0fa6badd6facde65befef02268bd442b5b8317c4 /arch/arm
parent873a30edbac4017af82525c1e2385d2b743f436e (diff)
tegra fb: Cleanup partially removed fb disable code.
An ioctl to disable fb used to exist and called from the nvrm daemon code. This was partially removed sometime back and there are still traces of that code causing some confusion which is cleaned up by this commit. ioctl define is left as-is so maintain compatibility to user mode code. Change-Id: I3f792d6be075a8754ea448d588e484afc67bd8ba Reviewed-on: http://git-master/r/878 Reviewed-by: Venkata (Muni) Anda <vanda@nvidia.com> Tested-by: Venkata (Muni) Anda <vanda@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/nvrm_user.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/nvrm_user.c b/arch/arm/mach-tegra/nvrm_user.c
index ffb0751a1035..a05cbd376809 100644
--- a/arch/arm/mach-tegra/nvrm_user.c
+++ b/arch/arm/mach-tegra/nvrm_user.c
@@ -68,12 +68,6 @@ static NvRtHandle s_RtHandle = NULL;
#define DEVICE_NAME "nvrm"
-#ifdef CONFIG_FB_TEGRA
-extern int tegra_fb_control(void *in, void *out);
-#else
-#define tegra_fb_control(_i, _o) do {} while (0)
-#endif
-
static const struct file_operations nvrm_fops =
{
.owner = THIS_MODULE,
@@ -283,8 +277,8 @@ long nvrm_unlocked_ioctl(struct file *file,
printk( "NvRmIoctls_NvRmGraphics: not supported\n" );
goto fail;
case NvRmIoctls_NvRmFbControl:
- tegra_fb_control(0, 0);
- break;
+ printk( "NvRmIoctls_NvRmFbControl: deprecated \n" );
+ break;
case NvRmIoctls_NvRmMemRead:
case NvRmIoctls_NvRmMemWrite: