diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
| commit | 36a23fc8aa0c72ecafe7aaee0a823b03b301e1df (patch) | |
| tree | 364aa8cf248b477d822d0344d7bba3c80f86cf9c /arch/ppc/platforms/Makefile | |
| parent | 23386fe572028ca0f9249fb3c71ed31b54cf1665 (diff) | |
| parent | fc215fe7e6f0420afee0e0987fcc311929ee662f (diff) | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/ppc/platforms/Makefile')
| -rw-r--r-- | arch/ppc/platforms/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile index 40f53fbe6d35..6260231987cb 100644 --- a/arch/ppc/platforms/Makefile +++ b/arch/ppc/platforms/Makefile | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_setup.o | 5 | obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_setup.o |
| 6 | obj-$(CONFIG_PREP_RESIDUAL) += residual.o | 6 | obj-$(CONFIG_PREP_RESIDUAL) += residual.o |
| 7 | obj-$(CONFIG_PQ2ADS) += pq2ads.o | ||
| 8 | obj-$(CONFIG_TQM8260) += tqm8260_setup.o | 7 | obj-$(CONFIG_TQM8260) += tqm8260_setup.o |
| 9 | obj-$(CONFIG_CPCI690) += cpci690.o | 8 | obj-$(CONFIG_CPCI690) += cpci690.o |
| 10 | obj-$(CONFIG_EV64260) += ev64260.o | 9 | obj-$(CONFIG_EV64260) += ev64260.o |
| @@ -24,6 +23,3 @@ obj-$(CONFIG_SBC82xx) += sbc82xx.o | |||
| 24 | obj-$(CONFIG_SPRUCE) += spruce.o | 23 | obj-$(CONFIG_SPRUCE) += spruce.o |
| 25 | obj-$(CONFIG_LITE5200) += lite5200.o | 24 | obj-$(CONFIG_LITE5200) += lite5200.o |
| 26 | obj-$(CONFIG_EV64360) += ev64360.o | 25 | obj-$(CONFIG_EV64360) += ev64360.o |
| 27 | obj-$(CONFIG_MPC86XADS) += mpc866ads_setup.o | ||
| 28 | obj-$(CONFIG_MPC885ADS) += mpc885ads_setup.o | ||
| 29 | obj-$(CONFIG_ADS8272) += mpc8272ads_setup.o | ||