summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/ide.h3
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 98a1a968ad93..4664fd44a986 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -22,6 +22,7 @@
#include <asm/system.h>
#include <asm/hdreg.h>
#include <asm/io.h>
+#include <asm/semaphore.h>
#define DEBUG_PM
@@ -774,6 +775,7 @@ typedef struct ide_drive_s {
int crc_count; /* crc counter to reduce drive speed */
struct list_head list;
struct device gendev;
+ struct semaphore gendev_rel_sem; /* to deal with device release() */
struct gendisk *disk;
} ide_drive_t;
@@ -1040,6 +1042,7 @@ typedef struct hwif_s {
unsigned auto_poll : 1; /* supports nop auto-poll */
struct device gendev;
+ struct semaphore gendev_rel_sem; /* To deal with device release() */
void *hwif_data; /* extra hwif data */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 4fc931b4e76f..6e6ff10ef587 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -878,6 +878,7 @@
#define PCI_DEVICE_ID_SII_680 0x0680
#define PCI_DEVICE_ID_SII_3112 0x3112
+#define PCI_DEVICE_ID_SII_1210SA 0x0240
#define PCI_VENDOR_ID_VISION 0x1098
#define PCI_DEVICE_ID_VISION_QD8500 0x0001