diff options
| -rw-r--r-- | driver-core/uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch | 2 | ||||
| -rw-r--r-- | pci/ide-remove-ide-reverse-ide-core.patch | 4 | ||||
| -rw-r--r-- | version | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/driver-core/uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch b/driver-core/uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch index e1d9924808ab7d..9d03d39f04c38e 100644 --- a/driver-core/uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch +++ b/driver-core/uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1171,6 +1171,8 @@ source "drivers/dma/Kconfig" +@@ -1172,6 +1172,8 @@ source "drivers/dma/Kconfig" source "drivers/dca/Kconfig" diff --git a/pci/ide-remove-ide-reverse-ide-core.patch b/pci/ide-remove-ide-reverse-ide-core.patch index f34d051633a33e..1e19b3f43a6116 100644 --- a/pci/ide-remove-ide-reverse-ide-core.patch +++ b/pci/ide-remove-ide-reverse-ide-core.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/ide.txt +++ b/Documentation/ide.txt -@@ -282,8 +282,6 @@ Summary of ide driver parameters for ker +@@ -280,8 +280,6 @@ Summary of ide driver parameters for ker ability to bit test for detection is currently unknown. @@ -100,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int noautodma = 0; #ifdef CONFIG_BLK_DEV_IDEACPI -@@ -1225,14 +1221,6 @@ static int __init ide_setup(char *s) +@@ -1217,14 +1213,6 @@ static int __init ide_setup(char *s) goto obsolete_option; } @@ -1 +1 @@ -2.6.25-rc3 +2.6.25-rc3-git4 |