diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-07 01:52:57 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-07 01:52:57 +0530 |
| commit | 97caf63d0c837f9b5c9f6f469979e68c0378e83f (patch) | |
| tree | c6fc834bcfb66268f474324eca619db419010532 /sound/oss | |
| parent | 6a1a6f4f69adf0febfd923795b45edeff63e75ed (diff) | |
Merge branch '3.4-rc1' into android-tegra-nv-3.3-rebased
Change-Id: Ib3b69ffc5ac3e07c9cc44cc49e9142088eec477e
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/msnd_pinnacle.c | 2 | ||||
| -rw-r--r-- | sound/oss/os.h | 1 | ||||
| -rw-r--r-- | sound/oss/vidc.c | 1 | ||||
| -rw-r--r-- | sound/oss/waveartist.c | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index eba734560f6f..2c79d60a725f 100644 --- a/sound/oss/msnd_pinnacle.c +++ b/sound/oss/msnd_pinnacle.c @@ -1631,7 +1631,7 @@ static int ide_irq __initdata = 0; static int joystick_io __initdata = 0; /* If we have the digital daugherboard... */ -static int digital __initdata = 0; +static bool digital __initdata = false; #endif static int fifosize __initdata = DEFFIFOSIZE; diff --git a/sound/oss/os.h b/sound/oss/os.h index a1a962d7f67d..75ad0cd0c0ab 100644 --- a/sound/oss/os.h +++ b/sound/oss/os.h @@ -16,7 +16,6 @@ #include <linux/slab.h> #include <linux/ioport.h> #include <asm/page.h> -#include <asm/system.h> #include <linux/vmalloc.h> #include <asm/uaccess.h> #include <linux/poll.h> diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 12ba28e7b933..92ca5bee1860 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c @@ -28,7 +28,6 @@ #include <asm/io.h> #include <asm/hardware/iomd.h> #include <asm/irq.h> -#include <asm/system.h> #include "sound_config.h" #include "vidc.h" diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index 52468742d9f2..24c430f721d4 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c @@ -42,7 +42,6 @@ #include <linux/spinlock.h> #include <linux/bitops.h> -#include <asm/system.h> #include "sound_config.h" #include "waveartist.h" |