Merge tag 'hwspinlock-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / atm / horizon.h

diff --git a/drivers/atm/horizon.h b/drivers/atm/horizon.h
index e2cc7020fa3ba54c21851708496b4195a0ec33c2..b48859d0d434bcfaf44ad0a94d848e6f12e9da1f 100644 (file)
--- a/drivers/atm/horizon.h
+++ b/drivers/atm/horizon.h
@@ -30,7 +30,6 @@
 #ifndef DRIVER_ATM_HORIZON_H
 #define DRIVER_ATM_HORIZON_H
 
-#include <linux/config.h>
 
 #ifdef CONFIG_ATM_HORIZON_DEBUG
 #define DEBUG_HORIZON
@@ -424,7 +423,7 @@ struct hrz_dev {
   wait_queue_head_t   tx_queue;
 
   u8                  irq;
-  long               flags;
+  unsigned long              flags;
   u8                  tx_last;
   u8                  tx_idle;