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

Commit 35ad1c88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: ->cable_detect method cannot be marked __devinit
  ide: ->quirkproc method cannot be marked __devinit
  cs5520: add enablebits checking
  cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
  ide-cd: fix endianity for the error message in cdrom_read_capacity
  ide: remove CONFIG_IDE_MAX_HWIFS
  remove unneeded #include <linux/ide.h>'s
  ide: fix regression caused by ide_device_{get,put}() addition (take 2)
  remove unnecessary <linux/hdreg.h> includes
  ide: sanitize struct ide_port_ops documentation (take 2)
  ide: fix ide_fix_driveid()
  ide: fix pre-EIDE SWDMA support on big-endian
parents 580da348 f454cbe8

arch/m68k/mac/baboon.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/mm.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/ide.h>



#include <asm/traps.h>

#include <asm/bootinfo.h>

arch/m68k/mac/via.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/mm.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/ide.h>

#include <linux/module.h>



#include <asm/bootinfo.h>

arch/mips/emma2rh/markeins/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/types.h>

#include <linux/initrd.h>

#include <linux/irq.h>

#include <linux/ide.h>

#include <linux/ioport.h>

#include <linux/param.h>	/* for HZ */

#include <linux/root_dev.h>

arch/mips/jazz/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * Copyright (C) 2007 by Thomas Bogendoerfer

 */

#include <linux/eisa.h>

#include <linux/hdreg.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/sched.h>
@@ -18,7 +17,6 @@ 
#include <linux/mm.h>

#include <linux/console.h>

#include <linux/fb.h>

#include <linux/ide.h>

#include <linux/pm.h>

#include <linux/screen_info.h>

#include <linux/platform_device.h>

arch/powerpc/include/asm/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define __ide_mm_outsl(p, a, c)	writesl((void __iomem *)(p), (a), (c))



#ifndef  __powerpc64__

#include <linux/hdreg.h>

#include <linux/ioport.h>



/* FIXME: use ide_platform host driver */