diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 15:29:07 +0100 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 15:29:07 +0100 |
commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/firmware/dell_rbu.c | |
parent | [SCSI] qla2xxx: Update version number to 8.01.03-k. (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
download | linux-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.xz linux-8a87a0b6313109d2fea87b1271d497c954ce2ca8.zip |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/firmware/dell_rbu.c')
-rw-r--r-- | drivers/firmware/dell_rbu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index ba17292eb290..6d83299e7c9b 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c @@ -34,7 +34,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include <linux/version.h> #include <linux/config.h> #include <linux/init.h> #include <linux/module.h> |