Commit 61559da5 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'guard' into 'debian/master'

Guard defines in rsi_sdio.h

See merge request !2
parents 75b17e3e e415a2d4
Pipeline #60809 passed with stages
in 1 minute and 45 seconds
From afece0e9788a9f0e801c4590a0b31723ecc5c74d Mon Sep 17 00:00:00 2001
From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
Date: Wed, 11 Nov 2020 00:47:45 +0100
Subject: [PATCH] Guard defines in rsi_sdio.h
In file included from /var/lib/dkms/rs9116/1.2.20/build/rsi_91x_hal.c:37:
/var/lib/dkms/rs9116/1.2.20/build/rsi_sdio.h:44: error: "SDIO_VENDOR_ID_RSI" redefined [-Werror]
#define SDIO_VENDOR_ID_RSI 0x041B
In file included from /var/lib/dkms/rs9116/1.2.20/build/rsi_sdio.h:40,
from /var/lib/dkms/rs9116/1.2.20/build/rsi_91x_hal.c:37:
./include/linux/mmc/sdio_ids.h:124: note: this is the location of the previous definition
#define SDIO_VENDOR_ID_RSI 0x041b
---
rsi/rsi_sdio.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/rsi/rsi_sdio.h b/rsi/rsi_sdio.h
index 44d56af..2adcf2f 100644
--- a/rsi/rsi_sdio.h
+++ b/rsi/rsi_sdio.h
@@ -41,12 +41,18 @@
#include "rsi_main.h"
/* SDIO VENDOR ID for RSI*/
+#ifndef SDIO_VENDOR_ID_RSI
#define SDIO_VENDOR_ID_RSI 0x041B
+#endif
/* Device ID for RS9113 */
+#ifndef SDIO_DEVICE_ID_RSI_9113
#define SDIO_DEVICE_ID_RSI_9113 0x9330
+#endif
/* Device ID for RS9116 */
+#ifndef SDIO_DEVICE_ID_RSI_9116
#define SDIO_DEVICE_ID_RSI_9116 0x9116
+#endif
/* Interrupt Bit Related Macros */
#define PKT_BUFF_AVAILABLE 1
--
2.20.1
0001-Update-to-newer-wireless-API.patch
0002-Add-missing-break.patch
0003-Guard-defines-in-rsi_sdio.h.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment