Initial commit for Sony MemoryStick support
This happens when trying to compile memory stick support inside the kernel.
drivers/memstick/core/mspro_block.o: In function `memstick_priv':
mspro_block.c:(.text+0x0): multiple definition of memstick_priv' drivers/memstick/core/memstick.o:memstick.c:(.text+0x0): first defined here drivers/memstick/core/mspro_block.o: In function memstick_get_drvdata':
mspro_block.c:(.text+0x6): multiple definition of memstick_get_drvdata' drivers/memstick/core/memstick.o:memstick.c:(.text+0x6): first defined here drivers/memstick/core/mspro_block.o: In function memstick_set_drvdata':
mspro_block.c:(.text+0xd): multiple definition of `memstick_set_drvdata' drivers/memstick/core/memstick.o:memstick.c:(.text+0xd): first defined here
This is because those three functions are not defined as static in "include/linux/memstick.h".
include/linux/memstick.h +3 -3
@@ -271,17 +271,17 @@ void memstick_new_req(struct memstick_host *host);int memstick_set_rw_addr (struct memstick_dev *card); -inline void *memstick_priv (struct memstick_host *host) +static inline void *memstick_priv (struct memstick_host *host) {return (void *)host->private; } -inline void *memstick_get_drvdata (struct memstick_dev *card) +static inline void *memstick_get_drvdata (struct memstick_dev *card) {return dev_get_drvdata (&card->dev); } -inline void memstick_set_drvdata (struct memstick_dev *card,void *data) +static inline void memstick_set_drvdata (struct memstick_dev *card,void *data) {dev_set_drvdata (&card->dev, data); }
---
Miguel Botón