summaryrefslogtreecommitdiff
path: root/drivers/ide/ppc/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 12:20:23 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-18 12:20:23 +0200
commitcd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch)
tree9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /drivers/ide/ppc/Makefile
parent6879827f4e08da219c99b91e4e1d793a924103e3 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/ide/ppc/Makefile')
-rw-r--r--drivers/ide/ppc/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ppc/Makefile b/drivers/ide/ppc/Makefile
index 65af5848b28c..74e52adcdf4b 100644
--- a/drivers/ide/ppc/Makefile
+++ b/drivers/ide/ppc/Makefile
@@ -1,3 +1,2 @@
obj-$(CONFIG_BLK_DEV_IDE_PMAC) += pmac.o
-obj-$(CONFIG_BLK_DEV_MPC8xx_IDE) += mpc8xx.o