diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-09-30 03:14:55 +0100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-13 11:48:34 +0000 |
| commit | ff87cb9dcd513583bd037f5c9edef8da9999d653 (patch) | |
| tree | 06ff13a793fce58ac017849f54bd8393a0eb93c0 /include/linux | |
| parent | 5a8f0310628bc7b409f849a4a8e886ef358986de (diff) | |
mtd: m25p80,spi-nor: Fix module aliases for m25p80
commit a5b7616c55e188fe3d6ef686bef402d4703ecb62 upstream.
m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The
MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but
its use was also removed at the same time. Now if m25p80 is built as
a module it doesn't get the necessary aliases to be loaded
automatically.
A clean solution to this will involve defining the list of device
IDs in spi-nor.h and removing struct spi_device_id from the spi-nor
API, but this is quite a large change.
As a quick fix suitable for stable, copy the device IDs back into
m25p80.
Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index db3cef6da452..667c5dc8736d 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -195,6 +195,5 @@ struct spi_nor { * Return: 0 for success, others for failure. */ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode); -extern const struct spi_device_id spi_nor_ids[]; #endif |