]> git.openfabrics.org - ~emulex/for-vlad/old/compat.git/commitdiff
compat-3.2.h: Avoid module_platform_driver redefinition
authorVladimir Sokolovsky <vlad@mellanox.com>
Thu, 21 May 2015 12:52:04 +0000 (15:52 +0300)
committerVladimir Sokolovsky <vlad@mellanox.com>
Thu, 21 May 2015 12:52:04 +0000 (15:52 +0300)
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
include/linux/compat-3.2.h

index b915ffce1dd84a0eb24d8bbce021c9263e647d35..7f4338c7b8a6c6fe052db98724bfda020e3199a7 100644 (file)
@@ -147,9 +147,11 @@ static inline char *hex_byte_pack(char *buf, u8 byte)
  * boilerplate.  Each module may only use this macro once, and
  * calling it replaces module_init() and module_exit()
  */
+#ifndef module_platform_driver
 #define module_platform_driver(__platform_driver) \
         module_driver(__platform_driver, platform_driver_register, \
                         platform_driver_unregister)
+#endif
 
 #define dma_zalloc_coherent LINUX_BACKPORT(dma_zalloc_coherent)
 static inline void *dma_zalloc_coherent(struct device *dev, size_t size,