diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:12:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:12:40 -0400 |
| commit | 2be4ff2f084842839b041b793ed6237e8d1d315a (patch) | |
| tree | 1d776ac1717edeff4ee7d59ab0aea2782cb86dba /drivers/pcmcia/hd64465_ss.c | |
| parent | cf2fa66055d718ae13e62451bb546505f63906a2 (diff) | |
| parent | a45b3fb19ba1e4dfc3fc53563a072612092930a9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
pcmcia: ioctl-internal definitions
pcmcia: cistpl header cleanup
pcmcia: remove unused argument to pcmcia_parse_tuple()
pcmcia: card services header cleanup
pcmcia: device_id header cleanup
pcmcia: encapsulate ioaddr_t
pcmcia: cleanup device driver header file
pcmcia: cleanup socket services header file
pcmcia: merge ds_internal.h into cs_internal.h
pcmcia: cleanup cs_internal.h
pcmcia: cs_internal.h is internal
pcmcia: use dev_printk for cs_error()
pcmcia: remove CS_ error codes alltogether
pcmcia: deprecate CS_BAD_TUPLE
pcmcia: deprecate CS_BAD_ARGS
pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
pcmcia: deprecate CS_NO_MORE_ITEMS
pcmcia: deprecate CS_IN_USE
pcmcia: deprecate CS_CONFIGURATION_LOCKED
...
Fix trivial conflict in drivers/pcmcia/ds.c manually
Diffstat (limited to 'drivers/pcmcia/hd64465_ss.c')
| -rw-r--r-- | drivers/pcmcia/hd64465_ss.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c index fb2bc1fb015d..117dc12ab438 100644 --- a/drivers/pcmcia/hd64465_ss.c +++ b/drivers/pcmcia/hd64465_ss.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <pcmcia/cistpl.h> | 46 | #include <pcmcia/cistpl.h> |
| 47 | #include <pcmcia/ds.h> | 47 | #include <pcmcia/ds.h> |
| 48 | #include <pcmcia/ss.h> | 48 | #include <pcmcia/ss.h> |
| 49 | #include "cs_internal.h" | ||
| 50 | 49 | ||
| 51 | #define MODNAME "hd64465_ss" | 50 | #define MODNAME "hd64465_ss" |
| 52 | 51 | ||