diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/sound/core.h | |
| parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/sound/core.h')
| -rw-r--r-- | include/sound/core.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index e5eec5f73502..35424a971b7a 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
| @@ -43,9 +43,6 @@ | |||
| 43 | #ifdef CONFIG_PCI | 43 | #ifdef CONFIG_PCI |
| 44 | struct pci_dev; | 44 | struct pci_dev; |
| 45 | #endif | 45 | #endif |
| 46 | #ifdef CONFIG_SBUS | ||
| 47 | struct sbus_dev; | ||
| 48 | #endif | ||
| 49 | 46 | ||
| 50 | /* device allocation stuff */ | 47 | /* device allocation stuff */ |
| 51 | 48 | ||