Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / include / linux / isicom.h

diff --git a/include/linux/isicom.h b/include/linux/isicom.h
index 45b3d48..bbd4219 100644 (file)
--- a/include/linux/isicom.h
+++ b/include/linux/isicom.h
@@ -1,11 +1,6 @@
 #ifndef _LINUX_ISICOM_H
 #define _LINUX_ISICOM_H
 
-/*#define              ISICOM_DEBUG*/
-/*#define              ISICOM_DEBUG_DTR_RTS*/
-
-#ifdef __KERNEL__
-
 #define                YES     1
 #define                NO      0
 
@@ -37,8 +32,6 @@
 #define                BOARD_COUNT     4
 #define                PORT_COUNT      (BOARD_COUNT*16)
 
-#define                SERIAL_TYPE_NORMAL      1
-
 /*   character sizes  */
 
 #define                ISICOM_CS5              0x0000
@@ -87,6 +80,4 @@
 
 #define                ISI_TXOK                0x0001
 
-#endif /*      __KERNEL__      */
-
 #endif /*      ISICOM_H        */