diff options
| author | James Morris <jmorris@namei.org> | 2009-09-30 01:47:33 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-30 01:47:33 +0400 |
| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/pcmcia/au1000_pb1x00.c | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
| download | linux-1669b049db50fc7f1d4e694fb115a0f408c63fce.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/pcmcia/au1000_pb1x00.c')
| -rw-r--r-- | drivers/pcmcia/au1000_pb1x00.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c index d6b4bd1db7d7..b1984ed72d1d 100644 --- a/drivers/pcmcia/au1000_pb1x00.c +++ b/drivers/pcmcia/au1000_pb1x00.c @@ -26,7 +26,6 @@ #include <linux/delay.h> #include <linux/ioport.h> #include <linux/kernel.h> -#include <linux/tqueue.h> #include <linux/timer.h> #include <linux/mm.h> #include <linux/proc_fs.h> |