diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /sound/pci/echoaudio/gina24.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'sound/pci/echoaudio/gina24.c')
| -rw-r--r-- | sound/pci/echoaudio/gina24.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c index 616b55825a19..5748fc6d29d6 100644 --- a/sound/pci/echoaudio/gina24.c +++ b/sound/pci/echoaudio/gina24.c | |||
| @@ -50,9 +50,9 @@ | |||
| 50 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 51 | #include <linux/interrupt.h> | 51 | #include <linux/interrupt.h> |
| 52 | #include <linux/pci.h> | 52 | #include <linux/pci.h> |
| 53 | #include <linux/slab.h> | ||
| 54 | #include <linux/moduleparam.h> | 53 | #include <linux/moduleparam.h> |
| 55 | #include <linux/firmware.h> | 54 | #include <linux/firmware.h> |
| 55 | #include <linux/slab.h> | ||
| 56 | #include <sound/core.h> | 56 | #include <sound/core.h> |
| 57 | #include <sound/info.h> | 57 | #include <sound/info.h> |
| 58 | #include <sound/control.h> | 58 | #include <sound/control.h> |