diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-13 01:41:41 +0300 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-13 01:41:41 +0300 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/um/drivers/fd.c | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
| download | linux-c4366889dda8110247be59ca41fddb82951a8c26.tar.xz | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/um/drivers/fd.c')
| -rw-r--r-- | arch/um/drivers/fd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c index 108b7dafbd0e..218aa0e9b792 100644 --- a/arch/um/drivers/fd.c +++ b/arch/um/drivers/fd.c @@ -12,6 +12,7 @@ #include "user_util.h" #include "chan_user.h" #include "os.h" +#include "um_malloc.h" struct fd_chan { int fd; |