Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 759979ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

parents 3ae0af12 a2932b35

drivers/pcmcia/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ config TCIC 


config PCMCIA_M8XX

        tristate "MPC8xx PCMCIA support"

        depends on PCMCIA && PPC

        depends on PCMCIA && PPC && 8xx 

        select PCCARD_NONSTATIC

        help

        Say Y here to include support for PowerPC 8xx series PCMCIA

drivers/pcmcia/au1000_db1x00.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 *

 */



#include <linux/config.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/errno.h>

drivers/pcmcia/au1000_generic.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#define __ASM_AU1000_PCMCIA_H



/* include the world */

#include <linux/config.h>



#include <pcmcia/cs_types.h>

#include <pcmcia/cs.h>

#include <pcmcia/ss.h>

drivers/pcmcia/au1000_pb1x00.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 */

#include <linux/config.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/delay.h>

drivers/pcmcia/au1000_xxs1500.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
 */

#include <linux/module.h>

#include <linux/init.h>

#include <linux/config.h>

#include <linux/delay.h>

#include <linux/ioport.h>

#include <linux/kernel.h>