Merge branch 'mpc86xx'

diff --combined drivers/Makefile
index 9be95c7bb8f8356cc63a0c577a80d32556f95514,98c4ef95f8fad28b1f4659dce07befeed167b9b9..25e162249f4bd971af0aef62d00772e30cda1a8c
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -31,7 -31,7 +31,7 @@@ OBJS  = 3c589.o 5701rls.o ali512x.o 
          bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
          cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
          e1000.o eepro100.o \
 -        i8042.o i82365.o inca-ip_sw.o keyboard.o \
 +        i8042.o inca-ip_sw.o keyboard.o \
          lan91c96.o \
          natsemi.o ne2000.o netarm_eth.o netconsole.o \
          ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
@@@ -44,13 -44,11 +44,13 @@@
          serial.o serial_max3100.o \
          serial_pl010.o serial_pl011.o serial_xuartlite.o \
          sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
-         status_led.o sym53c8xx.o \
+         status_led.o sym53c8xx.o ahci.o \
          ti_pci1410a.o tigon3.o tsec.o \
          usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
          videomodes.o w83c553f.o \
 -        ks8695eth.o
 +        ks8695eth.o \
 +        pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o  \
 +        rpx_pcmcia.o
  
  all:  $(LIB)