diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
| commit | 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 (patch) | |
| tree | f081ef10f3067b28a1ee316a8e7292eeda143419 /arch/ppc/platforms/chrp_setup.c | |
| parent | 54f00389563c80fa1de250a21256313ba01ca07d (diff) | |
| parent | 2b235826098bb653982894dfc3f70fd029f6c2e4 (diff) | |
| download | op-kernel-dev-0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8.zip op-kernel-dev-0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8.tar.gz | |
Merge libata upstream (which includes C/H/S support) include irq-pio branch.
Merge branch 'upstream'
Diffstat (limited to 'arch/ppc/platforms/chrp_setup.c')
| -rw-r--r-- | arch/ppc/platforms/chrp_setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c index 57f29ab..66346f0 100644 --- a/arch/ppc/platforms/chrp_setup.c +++ b/arch/ppc/platforms/chrp_setup.c @@ -32,7 +32,6 @@ #include <linux/module.h> #include <linux/delay.h> #include <linux/ide.h> -#include <linux/irq.h> #include <linux/console.h> #include <linux/seq_file.h> #include <linux/root_dev.h> |
