diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 11:33:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 11:33:53 -0400 |
| commit | 3e858759f72931683cb4a938871bac7a87d0de56 (patch) | |
| tree | cef9658bee8668c814fcdd8ebf3e0551bab7229f /drivers/staging | |
| parent | 3230ca9dc656a2354b679e2e62ee7740485563a9 (diff) | |
| parent | 6705a9cc52733cb5cbdbee72be66ab462d8fb46f (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] radio: wl128x: Update registration process with ST
[media] staging: altera-jtag needs delay.h
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/altera-stapl/altera-jtag.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/altera-stapl/altera-jtag.c b/drivers/staging/altera-stapl/altera-jtag.c index 6b633b179a7e..876308858b82 100644 --- a/drivers/staging/altera-stapl/altera-jtag.c +++ b/drivers/staging/altera-stapl/altera-jtag.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/delay.h> | ||
| 26 | #include <linux/firmware.h> | 27 | #include <linux/firmware.h> |
| 27 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 28 | #include <staging/altera.h> | 29 | #include <staging/altera.h> |