diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/firmware/dcdbas.c | |
parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) |
Merge ../linux-2.6
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 @@ | |||
20 | * GNU General Public License for more details. | 20 | * GNU General Public License for more details. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |