block: treat REQ_FUA and REQ_PREFLUSH as synchronous

[sfrench/cifs-2.6.git] / include / linux / adb.h

diff --git a/include/linux/adb.h b/include/linux/adb.h
index 63bca502fa55edf8ffd9df6e7c44f2c4c2f83e3c..cde41300c7ad8679964e17447e82b143922d30de 100644 (file)
--- a/include/linux/adb.h
+++ b/include/linux/adb.h
@@ -4,43 +4,8 @@
 #ifndef __ADB_H
 #define __ADB_H
 
-/* ADB commands */
-#define ADB_BUSRESET           0
-#define ADB_FLUSH(id)          (0x01 | ((id) << 4))
-#define ADB_WRITEREG(id, reg)  (0x08 | (reg) | ((id) << 4))
-#define ADB_READREG(id, reg)   (0x0C | (reg) | ((id) << 4))
+#include <uapi/linux/adb.h>
 
-/* ADB default device IDs (upper 4 bits of ADB command byte) */
-#define ADB_DONGLE     1       /* "software execution control" devices */
-#define ADB_KEYBOARD   2
-#define ADB_MOUSE      3
-#define ADB_TABLET     4
-#define ADB_MODEM      5
-#define ADB_MISC       7       /* maybe a monitor */
-
-#define ADB_RET_OK     0
-#define ADB_RET_TIMEOUT        3
-
-/* The kind of ADB request. The controller may emulate some
-   or all of those CUDA/PMU packet kinds */
-#define ADB_PACKET     0
-#define CUDA_PACKET    1
-#define ERROR_PACKET   2
-#define TIMER_PACKET   3
-#define POWER_PACKET   4
-#define MACIIC_PACKET  5
-#define PMU_PACKET     6
-#define ADB_QUERY      7
-
-/* ADB queries */
-
-/* ADB_QUERY_GETDEVINFO
- * Query ADB slot for device presence
- * data[2] = id, rep[0] = orig addr, rep[1] = handler_id
- */
-#define ADB_QUERY_GETDEVINFO   1
-
-#ifdef __KERNEL__
 
 struct adb_request {
        unsigned char data[32];
@@ -98,6 +63,4 @@ int adb_reset_bus(void);
 int adb_try_handler_change(int address, int new_id);
 int adb_get_infos(int address, int *original_address, int *handler_id);
 
-#endif /* __KERNEL__ */
-
 #endif /* __ADB_H */