diff options
author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /net/irda/irnet/irnet.h | |
parent | kbuild: explicit turn off gcc stack-protector (diff) | |
parent | [PATCH] genirq: Fixup ARM devel merge (diff) | |
download | linux-05668381140309088443bf5dc53add4104610fbb.tar.xz linux-05668381140309088443bf5dc53add4104610fbb.zip |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'net/irda/irnet/irnet.h')
-rw-r--r-- | net/irda/irnet/irnet.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index ad6caba02a7b..80887528e77e 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h @@ -248,7 +248,6 @@ #include <linux/miscdevice.h> #include <linux/poll.h> #include <linux/capability.h> -#include <linux/config.h> #include <linux/ctype.h> /* isspace() */ #include <asm/uaccess.h> #include <linux/init.h> |