diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 16:59:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 16:59:05 -0700 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /drivers/scsi/pcmcia | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
| download | blackbird-op-linux-17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b.tar.gz blackbird-op-linux-17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/scsi/pcmcia')
| -rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index a221b6ef9fa9..24e6cb8396e3 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c @@ -25,7 +25,6 @@ ***********************************************************************/ -#include <linux/version.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> |
