diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 11:11:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 11:11:23 -0400 |
| commit | 0950efd1a1490e869d19ec631eed75ef57772f8b (patch) | |
| tree | ee1138885190a3c7f6a0631c118ebb4ecbd3cb7a /drivers/pcmcia/au1000_pb1x00.c | |
| parent | 4406c56d0a4da7a37b9180abeaece6cd00bcc874 (diff) | |
| parent | 889c27744c30eb7a43b68c11e33e679cfafc8cd5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
pcmcia: document return value of pcmcia_loop_config
pcmcia: dtl1_cs: fix pcmcia_loop_config logic
pcmcia: drop non-existant includes
pcmcia: disable prefetch/burst for OZ6933
pcmcia: fix incorrect argument order to list_add_tail()
pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
pcmcia: Use phys_addr_t for physical addresses
pcmcia: drivers/pcmcia: Make static
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 @@ | |||
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/tqueue.h> | ||
| 30 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
| 31 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
| 32 | #include <linux/proc_fs.h> | 31 | #include <linux/proc_fs.h> |