* [PATCH] bus: fix omap compile error if CONFIG_OF is true
@ 2012-09-04 14:41 Alan Cox
2012-09-04 21:37 ` Stephen Rothwell
2012-09-04 21:47 ` Randy Dunlap
0 siblings, 2 replies; 4+ messages in thread
From: Alan Cox @ 2012-09-04 14:41 UTC (permalink / raw)
To: kishon, linux-next
From: Alan Cox <alan@linux•intel.com>
Signed-off-by: Alan Cox <alan@linux•intel.com>
---
drivers/bus/omap-ocp2scp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
index 9075ef8..ff63560 100644
--- a/drivers/bus/omap-ocp2scp.c
+++ b/drivers/bus/omap-ocp2scp.c
@@ -67,7 +67,7 @@ static const struct of_device_id omap_ocp2scp_id_table[] = {
{ .compatible = "ti,omap-ocp2scp" },
{}
};
-MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
+MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
#endif
static struct platform_driver omap_ocp2scp_driver = {
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] bus: fix omap compile error if CONFIG_OF is true
2012-09-04 14:41 [PATCH] bus: fix omap compile error if CONFIG_OF is true Alan Cox
@ 2012-09-04 21:37 ` Stephen Rothwell
2012-09-04 21:47 ` Randy Dunlap
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2012-09-04 21:37 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: kishon, linux-next, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 1023 bytes --]
Hi all,
On Tue, 04 Sep 2012 15:41:35 +0100 Alan Cox <alan@lxorguk•ukuu.org.uk> wrote:
>
> From: Alan Cox <alan@linux•intel.com>
>
> Signed-off-by: Alan Cox <alan@linux•intel.com>
> ---
>
> drivers/bus/omap-ocp2scp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
> index 9075ef8..ff63560 100644
> --- a/drivers/bus/omap-ocp2scp.c
> +++ b/drivers/bus/omap-ocp2scp.c
> @@ -67,7 +67,7 @@ static const struct of_device_id omap_ocp2scp_id_table[] = {
> { .compatible = "ti,omap-ocp2scp" },
> {}
> };
> -MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
> +MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
> #endif
>
> static struct platform_driver omap_ocp2scp_driver = {
This was caused by commit 26a84b3eaef0 ("drivers: bus: add a new driver
for omap-ocp2scp") which has been in the arm-soc tree for a few days ...
Thanks, Alan.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] bus: fix omap compile error if CONFIG_OF is true
2012-09-04 14:41 [PATCH] bus: fix omap compile error if CONFIG_OF is true Alan Cox
2012-09-04 21:37 ` Stephen Rothwell
@ 2012-09-04 21:47 ` Randy Dunlap
2012-09-05 0:05 ` Olof Johansson
1 sibling, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2012-09-04 21:47 UTC (permalink / raw)
To: Alan Cox; +Cc: kishon, linux-next
On 09/04/2012 07:41 AM, Alan Cox wrote:
> From: Alan Cox <alan@linux•intel.com>
>
> Signed-off-by: Alan Cox <alan@linux•intel.com>
> ---
>
> drivers/bus/omap-ocp2scp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
> index 9075ef8..ff63560 100644
> --- a/drivers/bus/omap-ocp2scp.c
> +++ b/drivers/bus/omap-ocp2scp.c
> @@ -67,7 +67,7 @@ static const struct of_device_id omap_ocp2scp_id_table[] = {
> { .compatible = "ti,omap-ocp2scp" },
> {}
> };
> -MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
> +MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
> #endif
>
> static struct platform_driver omap_ocp2scp_driver = {
>
> --
Kishon posted a patch for this on Aug. 23:
http://marc.info/?l=linux-next&m=134574365000518&w=2
Who needs to merge it?
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] bus: fix omap compile error if CONFIG_OF is true
2012-09-04 21:47 ` Randy Dunlap
@ 2012-09-05 0:05 ` Olof Johansson
0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2012-09-05 0:05 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Alan Cox, kishon, linux-next
On Tue, Sep 4, 2012 at 2:47 PM, Randy Dunlap <rdunlap@xenotime•net> wrote:
> On 09/04/2012 07:41 AM, Alan Cox wrote:
>
>> From: Alan Cox <alan@linux•intel.com>
>>
>> Signed-off-by: Alan Cox <alan@linux•intel.com>
>> ---
>>
>> drivers/bus/omap-ocp2scp.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
>> index 9075ef8..ff63560 100644
>> --- a/drivers/bus/omap-ocp2scp.c
>> +++ b/drivers/bus/omap-ocp2scp.c
>> @@ -67,7 +67,7 @@ static const struct of_device_id omap_ocp2scp_id_table[] = {
>> { .compatible = "ti,omap-ocp2scp" },
>> {}
>> };
>> -MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
>> +MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
>> #endif
>>
>> static struct platform_driver omap_ocp2scp_driver = {
>>
>> --
>
>
> Kishon posted a patch for this on Aug. 23:
> http://marc.info/?l=linux-next&m=134574365000518&w=2
>
> Who needs to merge it?
I've applied the first patch to arm-soc, since that's where the
breakage was introduced. Pushing out shortly.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-05 0:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-04 14:41 [PATCH] bus: fix omap compile error if CONFIG_OF is true Alan Cox
2012-09-04 21:37 ` Stephen Rothwell
2012-09-04 21:47 ` Randy Dunlap
2012-09-05 0:05 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox