[PATCH for 2.6.28] NAND: fsl_upm: fix build problem with 2.6.28-rc2

[Kumar Gala]

On Dec 3, 2008, at 10:27 AM, Anton Vorontsov wrote:

> On Wed, Dec 03, 2008 at 09:47:53AM -0600, Kumar Gala wrote:
> [...]
>>> The patch fixes following build error:
>>>
>>> CC      drivers/mtd/nand/fsl_upm.o
>>> drivers/mtd/nand/fsl_upm.c: In function 'fun_chip_init':
>>> drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 2 of
>>> 'of_mtd_parse_partitions' from incompatible pointer type
>>> drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 3 of
>>> 'of_mtd_parse_partitions' from incompatible pointer type
>>> drivers/mtd/nand/fsl_upm.c:168: error: too many arguments to  
>>> function
>>> 'of_mtd_parse_partitions'
>>> make[1]: *** [drivers/mtd/nand/fsl_upm.o] Error 1
>>>
>>> The breakage was introduced in
>>> 69fd3a8d098faf41a04930afa83757c0555ee360
>>> ("[MTD] remove unused mtd parameter in of_mtd_parse_partitions()").
>>>
>>> While at it, also add a check for the of_mtd_parse_partitions()  
>>> return
>>> value.
>>>
>>> Signed-off-by: Wolfgang Grandegger <wg at grandegger.com>
>>> Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
> [...]
>> David,
>>
>> what's going on with this patch?
>
> Recently I got email from Andrew's patch tracking system that
> the patch was merged into subsystem tree. Here it is:
>
> http://git.infradead.org/mtd-2.6.git?a=commitdiff;h=29b65861fbece04cfdf3fee352d5247369131850

is it going into 2.6.28 or waiting for .29?

- k