Merge branch 'fix/hda' into for-linus

[karo-tx-linux.git] / include / linux / hp_sdc.h

diff --git a/include/linux/hp_sdc.h b/include/linux/hp_sdc.h
index debd71515312b51569ab8dba413a8eb4871cfc29..d392975d888704b4c6854f1ebea948d436736265 100644 (file)
--- a/include/linux/hp_sdc.h
+++ b/include/linux/hp_sdc.h
@@ -71,6 +71,7 @@ typedef struct {
          struct semaphore *semaphore;  /* Semaphore to sleep on. */
        } act;
 } hp_sdc_transaction;
+int __hp_sdc_enqueue_transaction(hp_sdc_transaction *this);
 int hp_sdc_enqueue_transaction(hp_sdc_transaction *this);
 int hp_sdc_dequeue_transaction(hp_sdc_transaction *this);
 
@@ -100,7 +101,7 @@ int hp_sdc_dequeue_transaction(hp_sdc_transaction *this);
 #define HP_SDC_STATUS_REG      0x40    /* Data from an i8042 register */
 #define HP_SDC_STATUS_HILCMD    0x50   /* Command from HIL MLC */
 #define HP_SDC_STATUS_HILDATA   0x60   /* Data from HIL MLC */
-#define HP_SDC_STATUS_PUP      0x70    /* Sucessful power-up self test */
+#define HP_SDC_STATUS_PUP      0x70    /* Successful power-up self test */
 #define HP_SDC_STATUS_KCOOKED  0x80    /* Key from cooked kbd */
 #define HP_SDC_STATUS_KRPG     0xc0    /* Key from Repeat Gen */
 #define HP_SDC_STATUS_KMOD_SUP 0x10    /* Shift key is up */