diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 20:45:43 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 20:45:43 +0100 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /include/asm-ppc/serial.h | |
| parent | [SCSI] zfcp: removed wrong comment (diff) | |
| parent | libata: kill ATA_ENABLE_PATA (diff) | |
| download | linux-81b7bbd1932a04869d4c8635a75222dfc6089f96.tar.xz linux-81b7bbd1932a04869d4c8635a75222dfc6089f96.zip | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-ppc/serial.h')
| -rw-r--r-- | include/asm-ppc/serial.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h index 8a59f8871f32..8fc1b546613d 100644 --- a/include/asm-ppc/serial.h +++ b/include/asm-ppc/serial.h @@ -11,8 +11,6 @@ #include <platforms/ev64260.h> #elif defined(CONFIG_CHESTNUT) #include <platforms/chestnut.h> -#elif defined(CONFIG_GEMINI) -#include <platforms/gemini_serial.h> #elif defined(CONFIG_POWERPMC250) #include <platforms/powerpmc250.h> #elif defined(CONFIG_LOPEC) |