[alsa-devel] [PATCH asoc-dev 1/2] ASoC: Use correct include file for gpiolib in N810 machine driver
Signed-off-by: Jarkko Nikula jarkko.nikula@nokia.com --- sound/soc/omap/n810.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 2d982b1..c32487b 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -30,7 +30,7 @@
#include <asm/mach-types.h> #include <asm/arch/hardware.h> -#include <asm/gpio.h> +#include <linux/gpio.h> #include <asm/arch/mcbsp.h>
#include "omap-mcbsp.h"
Signed-off-by: Jarkko Nikula jarkko.nikula@nokia.com --- sound/soc/omap/n810.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index c32487b..c168a64 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -265,7 +265,7 @@ static int __init n810_soc_init(void) int err; struct device *dev;
- if (!machine_is_nokia_n810()) + if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) return -ENODEV;
n810_snd_device = platform_device_alloc("soc-audio", -1);
On Wed, Jun 11, 2008 at 11:52:49AM +0300, Jarkko Nikula wrote:
#include <asm/arch/hardware.h> -#include <asm/gpio.h> +#include <linux/gpio.h>
This appears to already be done that way in ALSA git?
On Wed, 11 Jun 2008 13:11:50 +0100 "ext Mark Brown" broonie@opensource.wolfsonmicro.com wrote:
On Wed, Jun 11, 2008 at 11:52:49AM +0300, Jarkko Nikula wrote:
#include <asm/arch/hardware.h> -#include <asm/gpio.h> +#include <linux/gpio.h>
This appears to already be done that way in ALSA git?
Ah, it seems that my first version of gpiolib conversion patch went into asoc-dev and Takashi took the second correct one.
http://mailman.alsa-project.org/pipermail/alsa-devel/2008-May/007829.html http://mailman.alsa-project.org/pipermail/alsa-devel/2008-May/007842.html
Probably this is worth to apply into asoc-dev in order to avoid merge conflict but not queue this back?
Jarkko
On Wed, Jun 11, 2008 at 03:29:53PM +0300, Jarkko Nikula wrote:
Probably this is worth to apply into asoc-dev in order to avoid merge conflict but not queue this back?
I've already fixed this in the dev branch and queued your other fix with a batch of other stuff I'm about to mail out.
participants (2)
-
Jarkko Nikula -
Mark Brown