diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 15:46:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 15:46:18 +0000 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/um/drivers | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
| download | kernel_samsung_tuna-330f28f691e9b349e34adcaf82b273cf061bb491.zip kernel_samsung_tuna-330f28f691e9b349e34adcaf82b273cf061bb491.tar.gz kernel_samsung_tuna-330f28f691e9b349e34adcaf82b273cf061bb491.tar.bz2 | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/line.c | 1 | ||||
| -rw-r--r-- | arch/um/drivers/port_kern.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 14a102e..cf8a97f 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -5,6 +5,7 @@ #include "linux/irqreturn.h" #include "linux/kd.h" +#include "linux/sched.h" #include "chan_kern.h" #include "irq_kern.h" #include "irq_user.h" diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c index 1993008..4ebc8a3 100644 --- a/arch/um/drivers/port_kern.c +++ b/arch/um/drivers/port_kern.c @@ -7,6 +7,7 @@ #include "linux/interrupt.h" #include "linux/list.h" #include "linux/mutex.h" +#include "linux/workqueue.h" #include "asm/atomic.h" #include "init.h" #include "irq_kern.h" |