diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-10 16:51:29 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 16:51:29 +1100 |
| commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
| tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /drivers/cdrom/viocd.c | |
| parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
| parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'drivers/cdrom/viocd.c')
| -rw-r--r-- | drivers/cdrom/viocd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 193446e6a08a..e27617259552 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -42,8 +42,6 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <asm/bug.h> - #include <asm/vio.h> #include <asm/scatterlist.h> #include <asm/iseries/hv_types.h> |