diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /sound/arm | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 877bb00d3295..d1f9da498729 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 18 | #include <linux/wait.h> | 18 | #include <linux/wait.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |