blob: 630b46ff0dc6cee312cb7333ae80b3bb521ab282 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
diff -urp ipw2100-1.0.5/ipw2100.c ipw2100-1.0.5-suspend2/ipw2100.c
--- ipw2100-1.0.5/ipw2100.c 2005-02-08 21:38:23.000000000 +0100
+++ ipw2100-1.0.5-suspend2/ipw2100.c 2005-06-24 23:19:22.000000000 +0200
@@ -6401,7 +6401,7 @@ static struct net_device *ipw2100_alloc_
INIT_STAT(&priv->fw_pend_stat);
-#ifdef CONFIG_SOFTWARE_SUSPEND2
+#ifdef CONFIG_SOFTWARE_SUSPEND2_BUILTIN
priv->workqueue = create_workqueue(DRV_NAME, 0);
#else
priv->workqueue = create_workqueue(DRV_NAME);
diff -urp ipw2100-1.0.5/ipw2100.h ipw2100-1.0.5-suspend2/ipw2100.h
--- ipw2100-1.0.5/ipw2100.h 2005-02-08 21:38:23.000000000 +0100
+++ ipw2100-1.0.5-suspend2/ipw2100.h 2005-06-24 23:19:22.000000000 +0200
@@ -57,6 +57,13 @@ typedef void irqreturn_t;
#define IW_QUAL_NOISE_INVALID 0x40
#endif
+#if !defined(CONFIG_SOFTWARE_SUSPEND2_BUILTIN) && \
+ (defined(CONFIG_SUSPEND2) || \
+ defined(CONFIG_SOFTWARE_SUSPEND2) || \
+ defined(CONFIG_SOFTWARE_SUSPEND2_MODULE))
+#define CONFIG_SOFTWARE_SUSPEND2_BUILTIN
+#endif
+
#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
#define pci_dma_sync_single_for_cpu pci_dma_sync_single
#define pci_dma_sync_single_for_device pci_dma_sync_single
|
GitWeb
