git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
drivers
/
atm
/
horizon.h
diff --git
a/drivers/atm/horizon.h
b/drivers/atm/horizon.h
index
e2cc702
..
b48859d
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;