diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 11:08:53 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 11:08:53 -0700 |
| commit | b214b7bbffca8ac6a6f1dad46408f7a9d4219098 (patch) | |
| tree | 2ef03e062e2a04ea9f2d5439b0daea5274a1bc98 /drivers/media/radio/radio-aimslab.c | |
| parent | 7d48ec3698e7b747efa744fd340b0f2d1dbfd3e0 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
| download | talos-obmc-linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.tar.gz talos-obmc-linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.zip | |
Merge commit 'v2.6.38-rc4' into spi/next
Diffstat (limited to 'drivers/media/radio/radio-aimslab.c')
| -rw-r--r-- | drivers/media/radio/radio-aimslab.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c index 6cc5d130fbc8..4ce10dbeadd8 100644 --- a/drivers/media/radio/radio-aimslab.c +++ b/drivers/media/radio/radio-aimslab.c @@ -31,6 +31,7 @@ #include <linux/module.h> /* Modules */ #include <linux/init.h> /* Initdata */ #include <linux/ioport.h> /* request_region */ +#include <linux/delay.h> /* msleep */ #include <linux/videodev2.h> /* kernel radio structs */ #include <linux/version.h> /* for KERNEL_VERSION MACRO */ #include <linux/io.h> /* outb, outb_p */ |
