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

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: add SH-S202J to ivb_list[]
  drivers/ide/pci/sc1200.c: fix suspend/resume buglets and warnings
  drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n
  hpt366: fix build for CONFIG_HOTPLUG=n
  cy82c693: fix build for CONFIG_HOTPLUG=n

...

This commit is contained in:

Linus Torvalds 2007-10-28 12:03:14 -07:00

parent ea45d15394 8588a2b732

commit 2a397e82c7

5 changed files with 28 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/ide/ide-iops.c

View file

6

drivers/ide/pci/cy82c693.c

View file

2

drivers/ide/pci/generic.c

View file

32

drivers/ide/pci/hpt366.c

View file

9

drivers/ide/pci/sc1200.c

View file