The patch titled
memstick-initial-commit-for-sony-memorystick-support fix
has been added to the -mm tree. Its filename is
memstick-initial-commit-for-sony-memorystick-support-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memstick-initial-commit-for-sony-memorystick-support fix
From: Miguel Botón <mboton@xxxxxxxxx>
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".
Signed-off-by: Miguel Botón <mboton@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memstick.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN include/linux/memstick.h~memstick-initial-commit-for-sony-memorystick-support-fix include/linux/memstick.h
--- a/include/linux/memstick.h~memstick-initial-commit-for-sony-memorystick-support-fix
+++ a/include/linux/memstick.h
@@ -271,17 +271,17 @@ void memstick_new_req(struct memstick_ho
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);
}
_
Patches currently in -mm which might be from mboton@xxxxxxxxx are
acpi-remove-duplicated-warning-message.patch
alsa-fix-compilation-warning-in-gcc.patch
memstick-initial-commit-for-sony-memorystick-support-fix.patch
git-netdev-all.patch
ssb-add-ssb_pcihost_set_power_state-function.patch
b44-power-down-phy-when-interface-down.patch
git-x86.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
