diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/asm-powerpc/floppy.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-powerpc/floppy.h')
| -rw-r--r-- | include/asm-powerpc/floppy.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/floppy.h b/include/asm-powerpc/floppy.h index 608164c39efb..7e2d169ee856 100644 --- a/include/asm-powerpc/floppy.h +++ b/include/asm-powerpc/floppy.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #define __ASM_POWERPC_FLOPPY_H | 11 | #define __ASM_POWERPC_FLOPPY_H |
| 12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <asm/machdep.h> | 14 | #include <asm/machdep.h> |
| 16 | 15 | ||
| 17 | #define fd_inb(port) inb_p(port) | 16 | #define fd_inb(port) inb_p(port) |