git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
pasemi
/
setup.c
diff --git
a/arch/powerpc/platforms/pasemi/setup.c
b/arch/powerpc/platforms/pasemi/setup.c
index 38f107b3c521194689e916ad141007a32e7cfae4..c5a3f61f8d857ba010108b01be9e75f624145a56 100644
(file)
--- a/
arch/powerpc/platforms/pasemi/setup.c
+++ b/
arch/powerpc/platforms/pasemi/setup.c
@@
-251,5
+251,4
@@
define_machine(pas) {
.calibrate_decr = generic_calibrate_decr,
.progress = pas_progress,
.machine_check_exception = pas_machine_check_handler,
- .pci_irq_fixup = pas_pci_irq_fixup,
};