diff options
| author |  Linus Torvalds <torvalds@g5.osdl.org>
| 2005-10-31 07:32:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org>
| 2005-10-31 07:32:56 -0800 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/firmware/dcdbas.c | |
| parent | Input: adbhid - fix OOPS introduced by dynalloc conversion (diff) | |
| parent | [DRIVER MODEL] Add missing driver_unregister to IMX serial driver (diff) | |
| download | linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.gz linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.bz2 linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'drivers/firmware/dcdbas.c')
| -rw-r--r-- | drivers/firmware/dcdbas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index 955537fe9958..8ed6ddbb9c5d 100644 --- a/drivers/firmware/dcdbas.c +++ b/drivers/firmware/dcdbas.c @@ -20,7 +20,7 @@ * GNU General Public License for more details. */ -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/errno.h> #include <linux/init.h> |