rpms/kernel/devel kernel.spec, 1.1155, 1.1156 linux-2.6-hdpvr.patch, 1.1, 1.2 linux-2.6-netdev-atl2.patch, 1.2, 1.3 linux-2.6-squashfs.patch, 1.31, 1.32 linux-2.6.27-lirc.patch, 1.1, 1.2 linux-2.6.27-pci-hush-allocation-failures.patch, 1.2, 1.3 linux-2.6-alsa-ac97-whitelist-AD1981B.patch, 1.1, NONE linux-2.6-alsa-ac97-whitelist.patch, 1.1, NONE linux-2.6-amd64-yes-i-know-you-live.patch, 1.1, NONE linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch, 1.2, NONE linux-2.6-dmi-autoload.patch, 1.1, NONE linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch, 1.2, NONE linux-2.6-e1000e-add-support-for-new-82574L-part.patch, 1.3, NONE linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch, 1.2, NONE linux-2.6-eeepc-laptop-update.patch, 1.2, NONE linux-2.6-input-dell-keyboard-keyup.patch, 1.2, NONE linux-2.6-libata-avoid-overflow-with-large-disks.patch, 1.1, NONE linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch, 1.3, NONE linux-2.6-merge-efifb-imacfb.patch, 1.5, NONE linux-2.6-net-tcp-option-ordering.patch, 1.1, NONE linux-2.6-netdev-r8169-2.6.28.patch, 1.1, NONE linux-2.6-nfs-client-mounts-hang.patch, 1.2, NONE linux-2.6-olpc-touchpad.patch, 1.1, NONE linux-2.6-quiet-iommu.patch, 1.1, NONE linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch, 1.1, NONE linux-2.6-selinux-empty-tty-files.patch, 1.1, NONE linux-2.6-toshiba-acpi-update.patch, 1.1, NONE linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch, 1.1, NONE linux-2.6.27-acpi-ec-drizzle.patch, 1.1, NONE linux-2.6.27-hwmon-applesmc-2.6.28.patch, 1.1, NONE linux-2.6.27-sony-laptop-suspend-fix.patch, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Dec 8 19:00:11 UTC 2008
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1604
Modified Files:
kernel.spec linux-2.6-hdpvr.patch linux-2.6-netdev-atl2.patch
linux-2.6-squashfs.patch linux-2.6.27-lirc.patch
linux-2.6.27-pci-hush-allocation-failures.patch
Removed Files:
linux-2.6-alsa-ac97-whitelist-AD1981B.patch
linux-2.6-alsa-ac97-whitelist.patch
linux-2.6-amd64-yes-i-know-you-live.patch
linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
linux-2.6-dmi-autoload.patch
linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
linux-2.6-e1000e-add-support-for-new-82574L-part.patch
linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
linux-2.6-eeepc-laptop-update.patch
linux-2.6-input-dell-keyboard-keyup.patch
linux-2.6-libata-avoid-overflow-with-large-disks.patch
linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch
linux-2.6-merge-efifb-imacfb.patch
linux-2.6-net-tcp-option-ordering.patch
linux-2.6-netdev-r8169-2.6.28.patch
linux-2.6-nfs-client-mounts-hang.patch
linux-2.6-olpc-touchpad.patch linux-2.6-quiet-iommu.patch
linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch
linux-2.6-selinux-empty-tty-files.patch
linux-2.6-toshiba-acpi-update.patch
linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
linux-2.6.27-acpi-ec-drizzle.patch
linux-2.6.27-hwmon-applesmc-2.6.28.patch
linux-2.6.27-sony-laptop-suspend-fix.patch
Log Message:
* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
- merging, merging, merging...
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1155
retrieving revision 1.1156
diff -u -r1.1155 -r1.1156
--- kernel.spec 8 Dec 2008 16:38:49 -0000 1.1155
+++ kernel.spec 8 Dec 2008 18:59:38 -0000 1.1156
@@ -587,7 +587,6 @@
Patch30: linux-2.6-x86-mtrr-kill-bogus-warning.patch
Patch41: linux-2.6-sysrq-c.patch
-Patch44: linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch
Patch140: linux-2.6-ps3-ehci-iso.patch
Patch141: linux-2.6-ps3-storage-alias.patch
@@ -613,10 +612,7 @@
Patch400: linux-2.6-scsi-cpqarray-set-master.patch
Patch420: linux-2.6-squashfs.patch
Patch430: linux-2.6-net-silence-noisy-printks.patch
-Patch440: linux-2.6-net-tcp-option-ordering.patch
Patch450: linux-2.6-input-kill-stupid-messages.patch
-Patch451: linux-2.6-input-dell-keyboard-keyup.patch
-Patch452: linux-2.6.27-hwmon-applesmc-2.6.28.patch
Patch460: linux-2.6-serial-460800.patch
Patch510: linux-2.6-silence-noise.patch
Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -625,19 +621,13 @@
Patch590: linux-2.6-selinux-move-open-perms-check.patch
Patch670: linux-2.6-ata-quirk.patch
-Patch671: linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch
-Patch672: linux-2.6-libata-avoid-overflow-with-large-disks.patch
#Patch680: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
Patch681: linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
Patch682: linux-2.6-iwl3945-ibss-tsf-fix.patch
Patch683: linux-2.6-hostap-skb-cb-hack.patch
-Patch690: linux-2.6-at76.patch
-
-Patch700: linux-2.6-nfs-client-mounts-hang.patch
-Patch800: linux-2.6-alsa-ac97-whitelist.patch
-Patch801: linux-2.6-alsa-ac97-whitelist-AD1981B.patch
+Patch690: linux-2.6-at76.patch
Patch1515: linux-2.6.27-lirc.patch
Patch1520: linux-2.6-hdpvr.patch
@@ -654,20 +644,6 @@
# kludge to make ich9 e1000 work
Patch2000: linux-2.6-e1000-ich9.patch
-# new e1000e hardware support from net-next-2.6 (e.g. ich10)
-Patch2001: linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
-Patch2002: linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
-Patch2003: linux-2.6-e1000e-add-support-for-new-82574L-part.patch
-
-# r8169 fixes: merge 2.6.28 updates
-Patch2005: linux-2.6-netdev-r8169-2.6.28.patch
-
-# Make Eee laptop driver suck less
-Patch2011: linux-2.6-eeepc-laptop-update.patch
-
-# Backport Toshiba updates so Bluetooth can be enabled (#437091)
-Patch2012: linux-2.6-toshiba-acpi-update.patch
-
# atl2 network driver
Patch2020: linux-2.6-netdev-atl2.patch
@@ -676,49 +652,18 @@
# olpc fixes
Patch2040: linux-2.6-olpc-speaker-out.patch
-Patch2041: linux-2.6-olpc-touchpad.patch
# linux1394 git patches
Patch2200: linux-2.6-firewire-git-update.patch
Patch2201: linux-2.6-firewire-git-pending.patch
-# get rid of imacfb and make efifb work everywhere it was used
-Patch2600: linux-2.6-merge-efifb-imacfb.patch
-
# Quiet boot fixes
# silence piix3 in quiet boot (ie, qemu)
Patch2800: linux-2.6-piix3-silence-quirk.patch
-# Hush IOMMU warnings, you typically can't fix them anyway
-Patch2801: linux-2.6-quiet-iommu.patch
# silence the ACPI blacklist code
Patch2802: linux-2.6-silence-acpi-blacklist.patch
-# it's... it's ALIVE!
-Patch2803: linux-2.6-amd64-yes-i-know-you-live.patch
# hush pci bar allocation failures
Patch2804: linux-2.6.27-pci-hush-allocation-failures.patch
-# EC storms aren't anything you can fix, shut up already
-Patch2805: linux-2.6.27-acpi-ec-drizzle.patch
-
-# ext4 fun - new & improved, now with less dev!
-Patch2900: linux-2.6.27-ext4-2.6.28-rc3-git6.patch
-Patch2901: linux-2.6.27-ext4-2.6.28-backport-fixups.patch
-Patch2902: linux-2.6.27-ext-dir-corruption-fix.patch
-
-# cciss sysfs links are broken
-Patch3000: linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
-
-# RTC fixes for systems that don't expose the device via PnP
-Patch3010: linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch
-Patch3020: linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
-
-# Sony Vaio suspend fix
-Patch3100: linux-2.6.27-sony-laptop-suspend-fix.patch
-
-# Add better support for DMI-based autoloading
-Patch3110: linux-2.6-dmi-autoload.patch
-
-# SELinux: Fix handling of empty tty_files. 37dd0bd04a3240d2922786d501e2f12cec858fbf BZ469079
-Patch3120: linux-2.6-selinux-empty-tty-files.patch
# Provide P4 clock modulation in-kernel for thermal reasons, but don't expose
# ui
@@ -1121,6 +1066,9 @@
# bugfixes to drivers and filesystems
#
+# Squashfs
+ApplyPatch linux-2.6-squashfs.patch
+
# ext4
# xfs
@@ -1160,23 +1108,13 @@
# ALSA
-# Filesystem patches.
-# Squashfs
-#ApplyPatch linux-2.6-squashfs.patch
-
# Networking
# Disable easy to trigger printk's.
ApplyPatch linux-2.6-net-silence-noisy-printks.patch
-# Fix tcp option ordering.
-#ApplyPatch linux-2.6-net-tcp-option-ordering.patch
# Misc fixes
# The input layer spews crap no-one cares about.
ApplyPatch linux-2.6-input-kill-stupid-messages.patch
-# Dell can't make keyboards
-#ApplyPatch linux-2.6-input-dell-keyboard-keyup.patch
-# kill annoying applesmc debug messages
-#ApplyPatch linux-2.6.27-hwmon-applesmc-2.6.28.patch
# Allow to use 480600 baud on 16C950 UARTs
ApplyPatch linux-2.6-serial-460800.patch
@@ -1197,10 +1135,6 @@
# ia64 ata quirk
ApplyPatch linux-2.6-ata-quirk.patch
-# fix it821x raid volumes
-#ApplyPatch linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch
-# fix overlow with large disk
-#ApplyPatch linux-2.6-libata-avoid-overflow-with-large-disks.patch
# fix spot's iwlwifi, hopefully...
#ApplyPatch linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
@@ -1214,47 +1148,23 @@
# Add misc wireless bits from upstream wireless tree
ApplyPatch linux-2.6-at76.patch
-# NFS Client mounts hang when exported directory do not exist
-#ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
-
-# implement whitelist for ac97
-#ApplyPatch linux-2.6-alsa-ac97-whitelist.patch
-#ApplyPatch linux-2.6-alsa-ac97-whitelist-AD1981B.patch
-
# http://www.lirc.org/
-#ApplyPatch linux-2.6.27-lirc.patch
+ApplyPatch linux-2.6.27-lirc.patch
# http://hg.jannau.net/hdpvr/
-#ApplyPatch linux-2.6-hdpvr.patch
+ApplyPatch linux-2.6-hdpvr.patch
# Fix the return code CD accesses when the CDROM drive door is closed
# but the drive isn't yet ready.
ApplyPatch linux-2.6-cdrom-door-status.patch
-# fix sysfs links for the cciss driver
-#ApplyPatch linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
-
-# fix RTC on systems with broken PnP
-#ApplyPatch linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch
-#ApplyPatch linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
-
ApplyPatch linux-2.6-e1000-ich9.patch
-#ApplyPatch linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
-#ApplyPatch linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch
-#ApplyPatch linux-2.6-e1000e-add-support-for-new-82574L-part.patch
-
-#ApplyPatch linux-2.6-netdev-r8169-2.6.28.patch
-
-#ApplyPatch linux-2.6-eeepc-laptop-update.patch
-#ApplyPatch linux-2.6-toshiba-acpi-update.patch
-
# atl2 network driver
-#ApplyPatch linux-2.6-netdev-atl2.patch
+ApplyPatch linux-2.6-netdev-atl2.patch
ApplyPatch linux-2.6-net-tulip-interrupt.patch
ApplyPatch linux-2.6-olpc-speaker-out.patch
-#ApplyPatch linux-2.6-olpc-touchpad.patch
# Nouveau DRM + drm fixes
ApplyPatch drm-modesetting-radeon.patch
@@ -1268,29 +1178,12 @@
ApplyPatch linux-2.6-firewire-git-pending.patch
fi
-# get rid of imacfb and make efifb work everywhere it was used
-#ApplyPatch linux-2.6-merge-efifb-imacfb.patch
-
-# Sony Vaio suspend fix
-#ApplyPatch linux-2.6.27-sony-laptop-suspend-fix.patch
-
-#ApplyPatch linux-2.6-dmi-autoload.patch
-
# silence piix3 in quiet boot (ie, qemu)
ApplyPatch linux-2.6-piix3-silence-quirk.patch
-# Hush IOMMU warnings, you typically can't fix them anyway
-#ApplyPatch linux-2.6-quiet-iommu.patch
# silence the ACPI blacklist code
ApplyPatch linux-2.6-silence-acpi-blacklist.patch
-# it's... it's ALIVE!
-#ApplyPatch linux-2.6-amd64-yes-i-know-you-live.patch
# hush pci bar allocation failures
-#ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
-# EC storms aren't anything you can fix, shut up already
-#ApplyPatch linux-2.6.27-acpi-ec-drizzle.patch
-
-# SELinux on ppc64 without plymouth can't boot
-#ApplyPatch linux-2.6-selinux-empty-tty-files.patch
+ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
ApplyPatch disable-p4-cpufreq-ui.patch
@@ -1869,6 +1762,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
+- merging, merging, merging...
+
* Mon Dec 08 2008 Dave Jones <davej at redhat.com>
- enable CONFIG_CGROUP_MEM_RES_CTLR.
linux-2.6-hdpvr.patch:
Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hdpvr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-hdpvr.patch 6 Oct 2008 17:11:35 -0000 1.1
+++ linux-2.6-hdpvr.patch 8 Dec 2008 18:59:39 -0000 1.2
@@ -1,22 +1,8 @@
- drivers/media/video/Kconfig | 2 +
- drivers/media/video/Makefile | 2 +
- drivers/media/video/hdpvr/Kconfig | 10 +
- drivers/media/video/hdpvr/Makefile | 7 +
- drivers/media/video/hdpvr/hdpvr-control.c | 212 +++++
- drivers/media/video/hdpvr/hdpvr-core.c | 455 +++++++++++
- drivers/media/video/hdpvr/hdpvr-i2c.c | 145 ++++
- drivers/media/video/hdpvr/hdpvr-video.c | 1258 +++++++++++++++++++++++++++++
- drivers/media/video/hdpvr/hdpvr.h | 324 ++++++++
- drivers/media/video/v4l2-common.c | 4 +
- include/linux/i2c-id.h | 1 +
- include/linux/videodev2.h | 7 +-
- 12 files changed, 2425 insertions(+), 2 deletions(-)
-
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 3e9e0dc..578402f 100644
+index 47102c2..0e279dd 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
-@@ -801,6 +801,8 @@ source "drivers/media/video/gspca/Kconfig"
+@@ -781,6 +781,8 @@ source "drivers/media/video/gspca/Kconfig"
source "drivers/media/video/pvrusb2/Kconfig"
@@ -26,10 +12,10 @@
source "drivers/media/video/usbvision/Kconfig"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index ef7c8d3..449ae8b 100644
+index 16962f3..4331a50 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
-@@ -121,6 +121,8 @@ obj-$(CONFIG_USB_PWC) += pwc/
+@@ -115,6 +115,8 @@ obj-$(CONFIG_USB_PWC) += pwc/
obj-$(CONFIG_USB_ZC0301) += zc0301/
obj-$(CONFIG_USB_GSPCA) += gspca/
@@ -2492,18 +2478,18 @@
+void print_bytes(char *string, unsigned char *buf, size_t len);
+#endif
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
-index 88ca131..8dfaa7d 100644
+index 846763d..34eca15 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
-@@ -354,6 +354,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
- case V4L2_CID_CONTRAST: name = "Contrast"; break;
- case V4L2_CID_SATURATION: name = "Saturation"; break;
- case V4L2_CID_HUE: name = "Hue"; break;
-+ case V4L2_CID_SHARPNESS: name = "Sharpness"; break;
+@@ -374,6 +374,7 @@ const char *v4l2_ctrl_get_name(u32 id)
+ case V4L2_CID_CONTRAST: return "Contrast";
+ case V4L2_CID_SATURATION: return "Saturation";
+ case V4L2_CID_HUE: return "Hue";
++ case V4L2_CID_SHARPNESS: return "Sharpness";
/* MPEG controls */
- case V4L2_CID_MPEG_CLASS: name = "MPEG Encoder Controls"; break;
-@@ -445,6 +446,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
+ case V4L2_CID_MPEG_CLASS: return "MPEG Encoder Controls";
+@@ -480,6 +481,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
case V4L2_CID_CONTRAST:
case V4L2_CID_SATURATION:
case V4L2_CID_HUE:
@@ -2511,7 +2497,7 @@
qctrl->flags |= V4L2_CTRL_FLAG_SLIDER;
break;
}
-@@ -483,6 +485,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
+@@ -518,6 +520,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);
case V4L2_CID_HUE:
return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);
@@ -2521,10 +2507,10 @@
/* MPEG controls */
case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index bf34c5f..d0ec672 100644
+index 01d67ba..1a08b81 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
-@@ -111,6 +111,7 @@
+@@ -110,6 +110,7 @@
#define I2C_HW_B_INTELFB 0x010021 /* intel framebuffer driver */
#define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */
#define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */
@@ -2532,28 +2518,3 @@
/* --- PCF 8584 based algorithms */
#define I2C_HW_P_ELEK 0x020002 /* Elektor ISA Bus inteface card */
-diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
-index 303d93f..f7b6bbc 100644
---- a/include/linux/videodev2.h
-+++ b/include/linux/videodev2.h
-@@ -910,6 +910,8 @@ enum v4l2_mpeg_audio_encoding {
- V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
- V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
- V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+ V4L2_MPEG_AUDIO_ENCODING_AAC = 3,
-+ V4L2_MPEG_AUDIO_ENCODING_AC3 = 4,
- };
- #define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102)
- enum v4l2_mpeg_audio_l1_bitrate {
-@@ -992,8 +994,9 @@ enum v4l2_mpeg_audio_crc {
- /* MPEG video */
- #define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200)
- enum v4l2_mpeg_video_encoding {
-- V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0,
-- V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1,
-+ V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0,
-+ V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1,
-+ V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
- };
- #define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201)
- enum v4l2_mpeg_video_aspect {
linux-2.6-netdev-atl2.patch:
Index: linux-2.6-netdev-atl2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-netdev-atl2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-netdev-atl2.patch 20 Jul 2008 21:36:08 -0000 1.2
+++ linux-2.6-netdev-atl2.patch 8 Dec 2008 18:59:39 -0000 1.3
@@ -1,12 +1,12 @@
-Index: linux-2.6.26.noarch/drivers/net/Kconfig
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/Kconfig
-+++ linux-2.6.26.noarch/drivers/net/Kconfig
-@@ -2375,6 +2375,17 @@ config ATL1E
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 231eeaf..9521c2e 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2328,6 +2328,17 @@ config ATL1E
To compile this driver as a module, choose M here. The module
will be called atl1e.
-+ config ATL2
++config ATL2
+ tristate "Atheros L2 Fast Ethernet support (EXPERIMENTAL)"
+ depends on PCI && EXPERIMENTAL
+ select CRC32
@@ -17,32 +17,34 @@
+ To compile this driver as a module, choose M here. The module
+ will be called atl2.
+
- endif # NETDEV_1000
-
- #
-Index: linux-2.6.26.noarch/drivers/net/Makefile
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/Makefile
-+++ linux-2.6.26.noarch/drivers/net/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_CAN) += can/
- obj-$(CONFIG_BONDING) += bonding/
+ config JME
+ tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+ depends on PCI
+diff --git a/drivers/net/Makefile b/drivers/net/Makefile
+index 017383a..8e12ec3 100644
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_ATL1) += atlx/
+ obj-$(CONFIG_ATL2) += atlx/
obj-$(CONFIG_ATL1E) += atl1e/
+obj-$(CONFIG_ATL2) += atl2/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_TEHUTI) += tehuti.o
-
-Index: linux-2.6.26.noarch/drivers/net/atl2/Makefile
-===================================================================
+ obj-$(CONFIG_ENIC) += enic/
+diff --git a/drivers/net/atl2/Makefile b/drivers/net/atl2/Makefile
+new file mode 100644
+index 0000000..2e451e9
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/Makefile
++++ b/drivers/net/atl2/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_ATL2) += atl2.o
+atl2-y += atl2_main.o atl2_hw.o atl2_ethtool.o atl2_param.o
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2.h b/drivers/net/atl2/atl2.h
+new file mode 100644
+index 0000000..dbab2e7
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2.h
++++ b/drivers/net/atl2/atl2.h
@@ -0,0 +1,120 @@
+/* atl2.h -- atl2 driver definitions
+ *
@@ -164,10 +166,11 @@
+};
+
+#endif /* _ATL2_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_ethtool.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_ethtool.c b/drivers/net/atl2/atl2_ethtool.c
+new file mode 100644
+index 0000000..0466b4a
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_ethtool.c
++++ b/drivers/net/atl2/atl2_ethtool.c
@@ -0,0 +1,416 @@
+/* atl2_ethtool.c -- atl2 ethtool support
+ *
@@ -585,10 +588,11 @@
+{
+ SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
+}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_hw.c b/drivers/net/atl2/atl2_hw.c
+new file mode 100644
+index 0000000..b8ac641
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.c
++++ b/drivers/net/atl2/atl2_hw.c
@@ -0,0 +1,760 @@
+/* atl2_hw.c -- atl2 hardware control functions
+ *
@@ -1350,10 +1354,11 @@
+ atl2_write_phy_reg(hw, MII_DBG_ADDR, 3);
+ atl2_write_phy_reg(hw, MII_DBG_DATA, 0);
+}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2_hw.h b/drivers/net/atl2/atl2_hw.h
+new file mode 100644
+index 0000000..e8f5b97
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.h
++++ b/drivers/net/atl2/atl2_hw.h
@@ -0,0 +1,758 @@
+/* atl2_hw.h -- atl2 hardware definitions
+ *
@@ -2113,10 +2118,11 @@
+};
+
+#endif /* _ATL2_HW_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_main.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_main.c b/drivers/net/atl2/atl2_main.c
+new file mode 100644
+index 0000000..f1d1810
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_main.c
++++ b/drivers/net/atl2/atl2_main.c
@@ -0,0 +1,1851 @@
+/* atl2_main.c -- atl2 driver main functions
+ *
@@ -3969,10 +3975,11 @@
+ struct atl2_adapter *adapter = hw->back;
+ pci_write_config_word(adapter->pdev, reg, *value);
+}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_osdep.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2_osdep.h b/drivers/net/atl2/atl2_osdep.h
+new file mode 100644
+index 0000000..b4cf080
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_osdep.h
++++ b/drivers/net/atl2/atl2_osdep.h
@@ -0,0 +1,72 @@
+/* atl2_osdep.h -- atl2 compat cruft
+ *
@@ -4046,10 +4053,11 @@
+ (readl(((a)->hw_addr + reg) + ((offset) << 2)))
+
+#endif /* _ATL2_OSDEP_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_param.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_param.c b/drivers/net/atl2/atl2_param.c
+new file mode 100644
+index 0000000..b26678c
--- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_param.c
++++ b/drivers/net/atl2/atl2_param.c
@@ -0,0 +1,317 @@
+/* atl2_param.c -- atl2 parameter processing
+ *
linux-2.6-squashfs.patch:
Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-squashfs.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- linux-2.6-squashfs.patch 30 Sep 2008 19:20:33 -0000 1.31
+++ linux-2.6-squashfs.patch 8 Dec 2008 18:59:40 -0000 1.32
@@ -1,7 +1,8 @@
-diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/Kconfig linux-2.6.27-rc4-squashfs3.4/fs/Kconfig
---- linux-2.6.27-rc4/fs/Kconfig 2008-08-11 15:20:41.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/fs/Kconfig 2008-08-19 18:31:56.000000000 +0100
-@@ -1348,6 +1348,56 @@ config CRAMFS
+diff --git a/fs/Kconfig b/fs/Kconfig
+index 522469a..b3ecd03 100644
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -931,6 +931,56 @@ config CRAMFS
If unsure, say N.
@@ -58,10 +59,11 @@
config VXFS_FS
tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
depends on BLOCK
-diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/Makefile linux-2.6.27-rc4-squashfs3.4/fs/Makefile
---- linux-2.6.27-rc4/fs/Makefile 2008-08-11 15:20:41.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/fs/Makefile 2008-08-19 18:31:56.000000000 +0100
-@@ -74,6 +74,7 @@ obj-$(CONFIG_JBD) += jbd/
+diff --git a/fs/Makefile b/fs/Makefile
+index d9f8afe..c567180 100644
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -76,6 +76,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
@@ -69,10 +71,25 @@
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
-diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/inode.c linux-2.6.27-rc4-squashfs3.4/fs/squashfs/inode.c
---- linux-2.6.27-rc4/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/inode.c 2008-08-26 08:25:23.000000000 +0100
-@@ -0,0 +1,2173 @@
+diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
+new file mode 100644
+index 0000000..1bc7b06
+--- /dev/null
++++ b/fs/squashfs/Makefile
+@@ -0,0 +1,7 @@
++#
++# Makefile for the linux squashfs routines.
++#
++
++obj-$(CONFIG_SQUASHFS) += squashfs.o
++squashfs-y += inode.o
++squashfs-y += squashfs2_0.o
+diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c
+new file mode 100644
+index 0000000..335ba3e
+--- /dev/null
++++ b/fs/squashfs/inode.c
+@@ -0,0 +1,2158 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
+ *
@@ -714,29 +731,14 @@
+{
+ squashfs_inode_t inode;
+ struct inode *i;
-+ struct dentry *dentry;
++ struct dentry *dentry = ERR_PTR(-ENOENT);
+
+ TRACE("Entered squashfs_export_iget\n");
+
+ inode = squashfs_inode_lookup(s, inode_number);
-+ if(inode == SQUASHFS_INVALID_BLK) {
-+ dentry = ERR_PTR(-ENOENT);
-+ goto failure;
-+ }
-+
-+ i = squashfs_iget(s, inode, inode_number);
-+ if(i == NULL) {
-+ dentry = ERR_PTR(-EACCES);
-+ goto failure;
-+ }
++ if (inode != SQUASHFS_INVALID_BLK)
++ dentry = d_obtain_alias(squashfs_iget(s, inode, inode_number));
+
-+ dentry = d_alloc_anon(i);
-+ if (dentry == NULL) {
-+ iput(i);
-+ dentry = ERR_PTR(-ENOMEM);
-+ }
-+
-+failure:
+ return dentry;
+}
+
@@ -2246,20 +2248,103 @@
+MODULE_DESCRIPTION("squashfs 3.4, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip at lougher.demon.co.uk>");
+MODULE_LICENSE("GPL");
-diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/Makefile linux-2.6.27-rc4-squashfs3.4/fs/squashfs/Makefile
---- linux-2.6.27-rc4/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/Makefile 2008-08-19 18:31:56.000000000 +0100
-@@ -0,0 +1,7 @@
-+#
-+# Makefile for the linux squashfs routines.
-+#
+diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
+new file mode 100644
+index 0000000..4e11742
+--- /dev/null
++++ b/fs/squashfs/squashfs.h
+@@ -0,0 +1,86 @@
++/*
++ * Squashfs - a compressed read only filesystem for Linux
++ *
++ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
++ * Phillip Lougher <phillip at lougher.demon.co.uk>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2,
++ * or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *
++ * squashfs.h
++ */
+
-+obj-$(CONFIG_SQUASHFS) += squashfs.o
-+squashfs-y += inode.o
-+squashfs-y += squashfs2_0.o
-diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/squashfs2_0.c linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs2_0.c
---- linux-2.6.27-rc4/fs/squashfs/squashfs2_0.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs2_0.c 2008-08-19 18:31:56.000000000 +0100
++#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
++#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
++#endif
++
++#ifdef SQUASHFS_TRACE
++#define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args)
++#else
++#define TRACE(s, args...) {}
++#endif
++
++#define ERROR(s, args...) printk(KERN_ERR "SQUASHFS error: "s, ## args)
++
++#define SERROR(s, args...) do { \
++ if (!silent) \
++ printk(KERN_ERR "SQUASHFS error: "s, ## args);\
++ } while(0)
++
++#define WARNING(s, args...) printk(KERN_WARNING "SQUASHFS: "s, ## args)
++
++static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode)
++{
++ return list_entry(inode, struct squashfs_inode_info, vfs_inode);
++}
++
++#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY)
++#define SQSH_EXTERN
++extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
++ long long index, unsigned int length,
++ long long *next_index, int srclength);
++extern int squashfs_get_cached_block(struct super_block *s, void *buffer,
++ long long block, unsigned int offset,
++ int length, long long *next_block,
++ unsigned int *next_offset);
++extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct
++ squashfs_cache_entry *fragment);
++extern struct squashfs_cache_entry *get_cached_fragment(struct super_block
++ *s, long long start_block,
++ int length);
++extern struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number);
++extern const struct address_space_operations squashfs_symlink_aops;
++extern const struct address_space_operations squashfs_aops;
++extern struct inode_operations squashfs_dir_inode_ops;
++#else
++#define SQSH_EXTERN static
++#endif
++
++#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
++extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk);
++#else
++static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk)
++{
++ return 0;
++}
++#endif
++
++#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
++extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk);
++#else
++static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
++{
++ return 0;
++}
++#endif
+diff --git a/fs/squashfs/squashfs2_0.c b/fs/squashfs/squashfs2_0.c
+new file mode 100644
+index 0000000..30ebdb9
+--- /dev/null
++++ b/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,740 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
@@ -3001,99 +3086,11 @@
+
+ return 1;
+}
-diff -x .gitignore -Nurp linux-2.6.27-rc4/fs/squashfs/squashfs.h linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs.h
---- linux-2.6.27-rc4/fs/squashfs/squashfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/fs/squashfs/squashfs.h 2008-08-19 18:31:56.000000000 +0100
-@@ -0,0 +1,86 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+ * Phillip Lougher <phillip at lougher.demon.co.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * squashfs.h
-+ */
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+#endif
-+
-+#ifdef SQUASHFS_TRACE
-+#define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args)
-+#else
-+#define TRACE(s, args...) {}
-+#endif
-+
-+#define ERROR(s, args...) printk(KERN_ERR "SQUASHFS error: "s, ## args)
-+
-+#define SERROR(s, args...) do { \
-+ if (!silent) \
-+ printk(KERN_ERR "SQUASHFS error: "s, ## args);\
-+ } while(0)
-+
-+#define WARNING(s, args...) printk(KERN_WARNING "SQUASHFS: "s, ## args)
-+
-+static inline struct squashfs_inode_info *SQUASHFS_I(struct inode *inode)
-+{
-+ return list_entry(inode, struct squashfs_inode_info, vfs_inode);
-+}
-+
-+#if defined(CONFIG_SQUASHFS_1_0_COMPATIBILITY ) || defined(CONFIG_SQUASHFS_2_0_COMPATIBILITY)
-+#define SQSH_EXTERN
-+extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
-+ long long index, unsigned int length,
-+ long long *next_index, int srclength);
-+extern int squashfs_get_cached_block(struct super_block *s, void *buffer,
-+ long long block, unsigned int offset,
-+ int length, long long *next_block,
-+ unsigned int *next_offset);
-+extern void release_cached_fragment(struct squashfs_sb_info *msblk, struct
-+ squashfs_cache_entry *fragment);
-+extern struct squashfs_cache_entry *get_cached_fragment(struct super_block
-+ *s, long long start_block,
-+ int length);
-+extern struct inode *squashfs_iget(struct super_block *s, squashfs_inode_t inode, unsigned int inode_number);
-+extern const struct address_space_operations squashfs_symlink_aops;
-+extern const struct address_space_operations squashfs_aops;
-+extern struct inode_operations squashfs_dir_inode_ops;
-+#else
-+#define SQSH_EXTERN static
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-+extern int squashfs_1_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_1_0_supported(struct squashfs_sb_info *msblk)
-+{
-+ return 0;
-+}
-+#endif
-+
-+#ifdef CONFIG_SQUASHFS_2_0_COMPATIBILITY
-+extern int squashfs_2_0_supported(struct squashfs_sb_info *msblk);
-+#else
-+static inline int squashfs_2_0_supported(struct squashfs_sb_info *msblk)
-+{
-+ return 0;
-+}
-+#endif
-diff -x .gitignore -Nurp linux-2.6.27-rc4/include/linux/squashfs_fs.h linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs.h
---- linux-2.6.27-rc4/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs.h 2008-08-19 18:31:56.000000000 +0100
+diff --git a/include/linux/squashfs_fs.h b/include/linux/squashfs_fs.h
+new file mode 100644
+index 0000000..4cdd11f
+--- /dev/null
++++ b/include/linux/squashfs_fs.h
@@ -0,0 +1,935 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
@@ -4030,9 +4027,11 @@
+
+#endif
+#endif
-diff -x .gitignore -Nurp linux-2.6.27-rc4/include/linux/squashfs_fs_i.h linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_i.h
---- linux-2.6.27-rc4/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_i.h 2008-08-19 18:31:56.000000000 +0100
+diff --git a/include/linux/squashfs_fs_i.h b/include/linux/squashfs_fs_i.h
+new file mode 100644
+index 0000000..b41c13c
+--- /dev/null
++++ b/include/linux/squashfs_fs_i.h
@@ -0,0 +1,45 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
@@ -4079,9 +4078,11 @@
+ struct inode vfs_inode;
+};
+#endif
-diff -x .gitignore -Nurp linux-2.6.27-rc4/include/linux/squashfs_fs_sb.h linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_sb.h
---- linux-2.6.27-rc4/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/include/linux/squashfs_fs_sb.h 2008-08-19 18:31:56.000000000 +0100
+diff --git a/include/linux/squashfs_fs_sb.h b/include/linux/squashfs_fs_sb.h
+new file mode 100644
+index 0000000..75c3716
+--- /dev/null
++++ b/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,79 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
@@ -4162,9 +4163,10 @@
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
-diff -x .gitignore -Nurp linux-2.6.27-rc4/init/do_mounts_rd.c linux-2.6.27-rc4-squashfs3.4/init/do_mounts_rd.c
---- linux-2.6.27-rc4/init/do_mounts_rd.c 2008-08-11 15:20:55.000000000 +0100
-+++ linux-2.6.27-rc4-squashfs3.4/init/do_mounts_rd.c 2008-08-19 18:31:56.000000000 +0100
+diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
+index a7c748f..a343342 100644
+--- a/init/do_mounts_rd.c
++++ b/init/do_mounts_rd.c
@@ -5,6 +5,7 @@
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
@@ -4173,7 +4175,7 @@
#include <linux/initrd.h>
#include <linux/string.h>
-@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, in
+@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, int out_fd);
* numbers could not be found.
*
* We currently check for the following magic numbers:
@@ -4181,7 +4183,7 @@
* minix
* ext2
* romfs
-@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start
+@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start_block)
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
@@ -4189,7 +4191,7 @@
int nblocks = -1;
unsigned char *buf;
-@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start
+@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start_block)
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
@@ -4197,7 +4199,7 @@
memset(buf, 0xe5, size);
/*
-@@ -99,6 +103,18 @@ identify_ramdisk_image(int fd, int start
+@@ -99,6 +103,18 @@ identify_ramdisk_image(int fd, int start_block)
goto done;
}
linux-2.6.27-lirc.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 linux-2.6.27-lirc.patch
Index: linux-2.6.27-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.27-lirc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27-lirc.patch 21 Oct 2008 21:08:57 -0000 1.1
+++ linux-2.6.27-lirc.patch 8 Dec 2008 18:59:40 -0000 1.2
@@ -1,32 +1,7 @@
-Linux Infrared Remote Control drivers
-
-Signed-off-by: Jarod Wilson <jarod at redhat.com>
-
----
-diff -Naurp linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c
---- linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c 2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c 2008-10-21 16:40:06.000000000 -0400
-@@ -386,6 +386,8 @@
-
- #define USB_VENDOR_ID_SOUNDGRAPH 0x15c2
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD 0x0038
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2 0x0036
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3 0x0034
-
- #define USB_VENDOR_ID_SUN 0x0430
- #define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab
-@@ -585,6 +587,8 @@ static const struct hid_blacklist {
- { USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
- { USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
- { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE },
-+ { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2, HID_QUIRK_IGNORE },
-+ { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3, HID_QUIRK_IGNORE },
- { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },
- { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
- { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
-diff -Naurp linux-2.6.27.noarch/drivers/input/Kconfig linux-2.6.27.noarch.lirc/drivers/input/Kconfig
---- linux-2.6.27.noarch/drivers/input/Kconfig 2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/input/Kconfig 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
+index 5f9d860..2ba0904 100644
+--- a/drivers/input/Kconfig
++++ b/drivers/input/Kconfig
@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
source "drivers/input/touchscreen/Kconfig"
@@ -36,9 +11,21 @@
source "drivers/input/misc/Kconfig"
endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Kconfig linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig
---- linux-2.6.27.noarch/drivers/input/lirc/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig 2008-10-21 16:04:34.000000000 -0400
+diff --git a/drivers/input/Makefile b/drivers/input/Makefile
+index 98c4f9a..6a1049b 100644
+--- a/drivers/input/Makefile
++++ b/drivers/input/Makefile
+@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/
+ obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o
+
+ obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
++
++obj-$(CONFIG_INPUT_LIRC) += lirc/
+diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
+new file mode 100644
+index 0000000..fad3bbb
+--- /dev/null
++++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,128 @@
+#
+# LIRC driver(s) configuration
@@ -168,9 +155,149 @@
+ PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
+
+endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
+new file mode 100644
+index 0000000..ceb5c86
+--- /dev/null
++++ b/drivers/input/lirc/Makefile
+@@ -0,0 +1,23 @@
++# Makefile for the lirc drivers.
++#
++
++# Each configuration option enables a list of files.
++
++EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src)
++
++obj-$(CONFIG_LIRC_DEV) += lirc_dev.o
++obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o
++obj-$(CONFIG_LIRC_I2C) += lirc_i2c.o
++obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
++obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
++obj-$(CONFIG_LIRC_IT87) += lirc_it87.o
++obj-$(CONFIG_LIRC_ITE8709) += lirc_ite8709.o
++obj-$(CONFIG_LIRC_MCEUSB) += lirc_mceusb.o
++obj-$(CONFIG_LIRC_MCEUSB2) += lirc_mceusb2.o
++obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o
++obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
++obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
++obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
++obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o
++obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
++obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o
+diff --git a/drivers/input/lirc/lirc.h b/drivers/input/lirc/lirc.h
+new file mode 100644
+index 0000000..dcdb6e8
+--- /dev/null
++++ b/drivers/input/lirc/lirc.h
+@@ -0,0 +1,103 @@
++/*
++ * lirc.h - linux infrared remote control header file
++ * last modified 2007/09/27
++ */
++
++#ifndef _LINUX_LIRC_H
++#define _LINUX_LIRC_H
++
++#include <linux/types.h>
++#include <linux/ioctl.h>
++
++#define PULSE_BIT 0x01000000
++#define PULSE_MASK 0x00FFFFFF
++
++/*
++ * lirc compatible hardware features
++ */
++
++
++#define LIRC_MODE2SEND(x) (x)
++#define LIRC_SEND2MODE(x) (x)
++#define LIRC_MODE2REC(x) ((x) << 16)
++#define LIRC_REC2MODE(x) ((x) >> 16)
++
++#define LIRC_MODE_RAW 0x00000001
++#define LIRC_MODE_PULSE 0x00000002
++#define LIRC_MODE_MODE2 0x00000004
++#define LIRC_MODE_CODE 0x00000008
++#define LIRC_MODE_LIRCCODE 0x00000010
++#define LIRC_MODE_STRING 0x00000020
++
++
++#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
++#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
++#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
++#define LIRC_CAN_SEND_CODE LIRC_MODE2SEND(LIRC_MODE_CODE)
++#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
++#define LIRC_CAN_SEND_STRING LIRC_MODE2SEND(LIRC_MODE_STRING)
++
++#define LIRC_CAN_SEND_MASK 0x0000003f
++
++#define LIRC_CAN_SET_SEND_CARRIER 0x00000100
++#define LIRC_CAN_SET_SEND_DUTY_CYCLE 0x00000200
++#define LIRC_CAN_SET_TRANSMITTER_MASK 0x00000400
++
++#define LIRC_CAN_REC_RAW LIRC_MODE2REC(LIRC_MODE_RAW)
++#define LIRC_CAN_REC_PULSE LIRC_MODE2REC(LIRC_MODE_PULSE)
++#define LIRC_CAN_REC_MODE2 LIRC_MODE2REC(LIRC_MODE_MODE2)
++#define LIRC_CAN_REC_CODE LIRC_MODE2REC(LIRC_MODE_CODE)
++#define LIRC_CAN_REC_LIRCCODE LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
++#define LIRC_CAN_REC_STRING LIRC_MODE2REC(LIRC_MODE_STRING)
++
++#define LIRC_CAN_REC_MASK LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
++
++#define LIRC_CAN_SET_REC_CARRIER (LIRC_CAN_SET_SEND_CARRIER << 16)
++#define LIRC_CAN_SET_REC_DUTY_CYCLE (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
++
++#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
++#define LIRC_CAN_SET_REC_CARRIER_RANGE 0x80000000
++#define LIRC_CAN_GET_REC_RESOLUTION 0x20000000
++
++#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
++#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
++
++#define LIRC_CAN_NOTIFY_DECODE 0x01000000
++
++/*
++ * IOCTL commands for lirc driver
++ */
++
++#define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32)
++
++#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, __u32)
++#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32)
++#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, __u32)
++#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, __u32)
++#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, __u32)
++#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, __u32)
++#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, __u32)
++
++/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
++#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32)
++
++#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, __u32)
++#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32)
++/* Note: these can reset the according pulse_width */
++#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, __u32)
++#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, __u32)
[...3906 lines suppressed...]
++
++ i = usb_register(&usb_remote_driver);
++ if (i < 0) {
++ printk(DRIVER_NAME ": usb register failed, result = %d\n", i);
++ return -ENODEV;
+ }
+
-+ info(DRIVER_DESC " " DRIVER_VERSION);
-+ return 0;
++ return SUCCESS;
+}
+
-+
-+/**
-+ * usb_mceusb_exit
-+ */
-+static void __exit usb_mceusb_exit(void)
++static void __exit usb_remote_exit(void)
+{
-+ /* deregister this driver with the USB subsystem */
-+ usb_deregister(&mceusb_driver);
++ usb_deregister(&usb_remote_driver);
+}
+
-+#ifdef MODULE
-+module_init(usb_mceusb_init);
-+module_exit(usb_mceusb_exit);
++module_init(usb_remote_init);
++module_exit(usb_remote_exit);
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_LICENSE("GPL");
-+MODULE_DEVICE_TABLE(usb, mceusb_table);
++MODULE_DEVICE_TABLE(usb, usb_remote_table);
+
-+module_param(debug, int, 0644);
++module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
-+
-+#else /* not MODULE */
-+subsys_initcall(usb_mceusb_init);
-+
+#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c
+new file mode 100644
+index 0000000..912cad2
+--- /dev/null
++++ b/drivers/input/lirc/lirc_parallel.c
@@ -0,0 +1,728 @@
+/****************************************************************************
+ ** lirc_parallel.c *********************************************************
@@ -8780,9 +8822,11 @@
+MODULE_PARM_DESC(debug, "Check for printer (default: 0)");
+
+#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.h linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.h
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.h 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_parallel.h b/drivers/input/lirc/lirc_parallel.h
+new file mode 100644
+index 0000000..4bed6af
+--- /dev/null
++++ b/drivers/input/lirc/lirc_parallel.h
@@ -0,0 +1,26 @@
+/* lirc_parallel.h */
+
@@ -8810,9 +8854,11 @@
+#define LIRC_PARALLEL_TRANSMITTER_MASK ((1<<LIRC_PARALLEL_MAX_TRANSMITTERS) - 1)
+
+#endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_sasem.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sasem.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_sasem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sasem.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
+new file mode 100644
+index 0000000..003f492
+--- /dev/null
++++ b/drivers/input/lirc/lirc_sasem.c
@@ -0,0 +1,969 @@
+/* lirc_sasem.c - USB remote support for LIRC
+ * Version 0.5
@@ -9783,9 +9829,11 @@
+module_exit(sasem_exit);
+
+#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
+new file mode 100644
+index 0000000..465edd9
+--- /dev/null
++++ b/drivers/input/lirc/lirc_serial.c
@@ -0,0 +1,1312 @@
+/****************************************************************************
+ ** lirc_serial.c ***********************************************************
@@ -11099,9 +11147,11 @@
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_sir.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sir.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_sir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sir.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
+new file mode 100644
+index 0000000..ea192b2
+--- /dev/null
++++ b/drivers/input/lirc/lirc_sir.c
@@ -0,0 +1,1302 @@
+/*
+ * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
@@ -12405,9 +12455,11 @@
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_streamzap.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_streamzap.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_streamzap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_streamzap.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
+new file mode 100644
+index 0000000..69865cb
+--- /dev/null
++++ b/drivers/input/lirc/lirc_streamzap.c
@@ -0,0 +1,795 @@
+/*
+ * Streamzap Remote Control driver
@@ -13204,9 +13256,11 @@
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_ttusbir.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_ttusbir.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_ttusbir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_ttusbir.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c
+new file mode 100644
+index 0000000..9ed9c7b
+--- /dev/null
++++ b/drivers/input/lirc/lirc_ttusbir.c
@@ -0,0 +1,400 @@
+/****************************************************************************
+ ** lirc_ttusbir.c ***********************************************************
@@ -13608,9 +13662,11 @@
+subsys_initcall(ttusbir_init_module);
+
+#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_zilog.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_zilog.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_zilog.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_zilog.c 2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
+new file mode 100644
+index 0000000..20e6b27
+--- /dev/null
++++ b/drivers/input/lirc/lirc_zilog.c
@@ -0,0 +1,1395 @@
+/*
+ * i2c IR lirc plugin for devices with zilog IR processors
@@ -15007,39 +15063,3 @@
+ * c-basic-offset: 8
+ * End:
+ */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Makefile linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile
---- linux-2.6.27.noarch/drivers/input/lirc/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile 2008-10-21 16:04:26.000000000 -0400
-@@ -0,0 +1,23 @@
-+# Makefile for the lirc drivers.
-+#
-+
-+# Each configuration option enables a list of files.
-+
-+EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src)
-+
-+obj-$(CONFIG_LIRC_DEV) += lirc_dev.o
-+obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o
-+obj-$(CONFIG_LIRC_I2C) += lirc_i2c.o
-+obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
-+obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
-+obj-$(CONFIG_LIRC_IT87) += lirc_it87.o
-+obj-$(CONFIG_LIRC_ITE8709) += lirc_ite8709.o
-+obj-$(CONFIG_LIRC_MCEUSB) += lirc_mceusb.o
-+obj-$(CONFIG_LIRC_MCEUSB2) += lirc_mceusb2.o
-+obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o
-+obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
-+obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
-+obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
-+obj-$(CONFIG_LIRC_STREAMZAP) += lirc_streamzap.o
-+obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
-+obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o
-diff -Naurp linux-2.6.27.noarch/drivers/input/Makefile linux-2.6.27.noarch.lirc/drivers/input/Makefile
---- linux-2.6.27.noarch/drivers/input/Makefile 2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/input/Makefile 2008-10-21 16:03:34.000000000 -0400
-@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC) += misc/
- obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o
-
- obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
-+
-+obj-$(CONFIG_INPUT_LIRC) += lirc/
linux-2.6.27-pci-hush-allocation-failures.patch:
Index: linux-2.6.27-pci-hush-allocation-failures.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.27-pci-hush-allocation-failures.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.27-pci-hush-allocation-failures.patch 23 Oct 2008 14:41:05 -0000 1.2
+++ linux-2.6.27-pci-hush-allocation-failures.patch 8 Dec 2008 18:59:40 -0000 1.3
@@ -1,42 +1,8 @@
-diff -up linux-2.6.27.noarch/drivers/pci/setup-res.c.jx linux-2.6.27.noarch/drivers/pci/setup-res.c
---- linux-2.6.27.noarch/drivers/pci/setup-res.c.jx 2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch/drivers/pci/setup-res.c 2008-10-16 14:12:13.000000000 -0400
-@@ -138,10 +138,10 @@ int pci_assign_resource(struct pci_dev *
-
- align = resource_alignment(res);
- if (!align) {
-- dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
-- "alignment) [%#llx-%#llx] flags %#lx\n",
-- resno, (unsigned long long)res->start,
-- (unsigned long long)res->end, res->flags);
-+ dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
-+ "alignment) [%#llx-%#llx] flags %#lx\n",
-+ resno, (unsigned long long)res->start,
-+ (unsigned long long)res->end, res->flags);
- return -EINVAL;
- }
-
-@@ -162,11 +162,11 @@ int pci_assign_resource(struct pci_dev *
- }
-
- if (ret) {
-- dev_err(&dev->dev, "BAR %d: can't allocate %s resource "
-- "[%#llx-%#llx]\n", resno,
-- res->flags & IORESOURCE_IO ? "I/O" : "mem",
-- (unsigned long long)res->start,
-- (unsigned long long)res->end);
-+ dev_info(&dev->dev, "BAR %d: can't allocate %s resource "
-+ "[%#llx-%#llx]\n", resno,
-+ res->flags & IORESOURCE_IO ? "I/O" : "mem",
-+ (unsigned long long)res->start,
-+ (unsigned long long)res->end);
- } else {
- res->flags &= ~IORESOURCE_STARTALIGN;
- if (resno < PCI_BRIDGE_RESOURCES)
-diff -up linux-2.6.27.noarch/arch/x86/pci/i386.c.jx linux-2.6.27.noarch/arch/x86/pci/i386.c
---- linux-2.6.27.noarch/arch/x86/pci/i386.c.jx 2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch/arch/x86/pci/i386.c 2008-10-23 10:21:14.000000000 -0400
-@@ -128,7 +128,7 @@ static void __init pcibios_allocate_bus_
+diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
+index 844df0c..43d9783 100644
+--- a/arch/x86/pci/i386.c
++++ b/arch/x86/pci/i386.c
+@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
pr = pci_find_parent_resource(dev, r);
if (!r->start || !pr ||
request_resource(pr, r) < 0) {
@@ -45,7 +11,7 @@
/*
* Something is wrong with the region.
* Invalidate the resource to prevent
-@@ -169,7 +169,7 @@ static void __init pcibios_allocate_reso
+@@ -170,7 +170,7 @@ static void __init pcibios_allocate_resources(int pass)
r->flags, disabled, pass);
pr = pci_find_parent_resource(dev, r);
if (!pr || request_resource(pr, r) < 0) {
@@ -54,3 +20,25 @@
/* We'll assign a new address later */
r->end -= r->start;
r->start = 0;
+diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
+index 2dbd96c..4e37563 100644
+--- a/drivers/pci/setup-res.c
++++ b/drivers/pci/setup-res.c
+@@ -134,7 +134,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
+
+ align = resource_alignment(res);
+ if (!align) {
+- dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
++ dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
+ "alignment) %pR flags %#lx\n",
+ resno, res, res->flags);
+ return -EINVAL;
+@@ -157,7 +157,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
+ }
+
+ if (ret) {
+- dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
++ dev_info(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
+ resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
+ } else {
+ res->flags &= ~IORESOURCE_STARTALIGN;
--- linux-2.6-alsa-ac97-whitelist-AD1981B.patch DELETED ---
--- linux-2.6-alsa-ac97-whitelist.patch DELETED ---
--- linux-2.6-amd64-yes-i-know-you-live.patch DELETED ---
--- linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch DELETED ---
--- linux-2.6-dmi-autoload.patch DELETED ---
--- linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch DELETED ---
--- linux-2.6-e1000e-add-support-for-new-82574L-part.patch DELETED ---
--- linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch DELETED ---
--- linux-2.6-eeepc-laptop-update.patch DELETED ---
--- linux-2.6-input-dell-keyboard-keyup.patch DELETED ---
--- linux-2.6-libata-avoid-overflow-with-large-disks.patch DELETED ---
--- linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch DELETED ---
--- linux-2.6-merge-efifb-imacfb.patch DELETED ---
--- linux-2.6-net-tcp-option-ordering.patch DELETED ---
--- linux-2.6-netdev-r8169-2.6.28.patch DELETED ---
--- linux-2.6-nfs-client-mounts-hang.patch DELETED ---
--- linux-2.6-olpc-touchpad.patch DELETED ---
--- linux-2.6-quiet-iommu.patch DELETED ---
--- linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch DELETED ---
--- linux-2.6-selinux-empty-tty-files.patch DELETED ---
--- linux-2.6-toshiba-acpi-update.patch DELETED ---
--- linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch DELETED ---
--- linux-2.6.27-acpi-ec-drizzle.patch DELETED ---
--- linux-2.6.27-hwmon-applesmc-2.6.28.patch DELETED ---
--- linux-2.6.27-sony-laptop-suspend-fix.patch DELETED ---
More information about the fedora-extras-commits
mailing list