diff options
| author | Sachin Nikam <snikam@nvidia.com> | 2010-06-25 10:51:35 +0530 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2010-06-25 03:02:44 -0700 |
| commit | cceed926fb99e3034443b43e14cfe66fa850acec (patch) | |
| tree | 8a24a64675c73ad150e66c22b18007c8f9971bb5 /arch | |
| parent | 9e89276dc1ae902a814aca973709ff0724f6f059 (diff) | |
kernel: fixing kernel compilation warnings
Integrating warning fixes from kernel .29 to .32
Change-Id: I95f0dd92e830f80cae2fb4d3383c9efa845238a9
Reviewed-on: http://git-master/r/3176
Tested-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-nvodm.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/nvrpc_user.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-nvodm.c b/arch/arm/mach-tegra/board-nvodm.c index 451506e6a763..fa84dc2db108 100644 --- a/arch/arm/mach-tegra/board-nvodm.c +++ b/arch/arm/mach-tegra/board-nvodm.c @@ -61,7 +61,7 @@ #include "board.h" #include "nvrm_pmu.h" -#ifdef CONFIG_KEYBOARD_GPIO +#if defined(CONFIG_KEYBOARD_GPIO) #include "nvodm_query_gpio.h" #include <linux/gpio_keys.h> #include <linux/input.h> @@ -761,7 +761,7 @@ static noinline void __init tegra_setup_kbc(void) static void tegra_setup_kbc(void) { } #endif -#ifdef CONFIG_KEYBOARD_GPIO +#if defined(CONFIG_KEYBOARD_GPIO) struct gpio_keys_platform_data tegra_button_data; static char *gpio_key_names = "gpio_keys"; static noinline void __init tegra_setup_gpio_key(void) diff --git a/arch/arm/mach-tegra/nvrpc_user.c b/arch/arm/mach-tegra/nvrpc_user.c index 7a9b4b7132f8..ff7894fcc893 100644 --- a/arch/arm/mach-tegra/nvrpc_user.c +++ b/arch/arm/mach-tegra/nvrpc_user.c @@ -40,7 +40,7 @@ ((size) > sizeof((stackbuf)) ? kzalloc((size),(gfp)) : (stackbuf)) #define nvrpc_stack_kfree(stackbuf, buf) \ do { \ - if ((buf) && (buf)!=(stackbuf)) \ + if ((buf) && (buf)!=(void *)(stackbuf)) \ kfree(buf); \ } while (0); |