Merge: Correction for 2.6.23-git kernel - unregister_chrdev() does not return value.

[lincan.git] / lincan / include / tscan1.h

diff --git a/lincan/include/tscan1.h b/lincan/include/tscan1.h
index ae87e838a1a2af3bf08d7b3134c9a477c07a933d..427b387f88d7bedb0ae917cf8b6f4127425b45a9 100644 (file)
--- a/lincan/include/tscan1.h
+++ b/lincan/include/tscan1.h
@@ -10,8 +10,8 @@
 //Ids SECTION
 #define TSCAN1_ID0             0xF6
 #define TSCAN1_ID1             0xB9
-#define TS7KV_ID0                      0x41
-#define TS7KV_ID1                      0x20
+#define TS7KV_ID0              0x41
+#define TS7KV_ID1              0x20
 
 //MEMORY SECTION
 #ifdef CONFIG_ARM
@@ -19,11 +19,6 @@
 #define TSXXX_BASE_IO  0x01E00000
 #endif
 
-#ifdef CONFIG_X86
-#define TSXXX_BASE_IO  0x00
-#define TS7XXX_IO8_BASE        0x00
-#endif
-
 #define TSCAN1_BASE_IO 0x150
 #define TS7KV_BASE_IO  0xE0
 #define TSXXX_IO_RANGE 0x8
@@ -63,8 +58,8 @@ int tscan1_reset(struct candevice_t *candev);
 int tscan1_init_hw_data(struct candevice_t *candev);
 int tscan1_init_chip_data(struct candevice_t *candev, int chipnr);
 int tscan1_init_obj_data(struct canchip_t *chip, int objnr);
-void tscan1_write_register(unsigned data, unsigned long address);
-unsigned tscan1_read_register(unsigned long address);
+void tscan1_write_register(unsigned data, can_ioptr_t address);
+unsigned tscan1_read_register(can_ioptr_t address);
 int tscan1_program_irq(struct candevice_t *candev);
 
 unsigned long tscan1_getmappedaddr(unsigned long address);