The patch titled tridentfb-resource-management-fixes-in-probe-function-fix has been added to the -mm tree. Its filename is tridentfb-resource-management-fixes-in-probe-function-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tridentfb-resource-management-fixes-in-probe-function-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> - Remove inlines - they're slower! - coding-style fixes Cc: Krzysztof Helt <krzysztof.h1@xxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/tridentfb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/video/tridentfb.c~tridentfb-resource-management-fixes-in-probe-function-fix drivers/video/tridentfb.c --- a/drivers/video/tridentfb.c~tridentfb-resource-management-fixes-in-probe-function-fix +++ a/drivers/video/tridentfb.c @@ -564,9 +564,10 @@ static inline void write3CE(int reg, uns t_outb(val, 0x3CF); } -static inline void enable_mmio(void) +static void enable_mmio(void) { unsigned char tmp; + /* Goto New Mode */ outb(0x0B, 0x3C4); inb(0x3C5); @@ -584,9 +585,10 @@ static inline void enable_mmio(void) t_outb(tmp, 0x3C5); } -static inline void disable_mmio(void) +static void disable_mmio(void) { unsigned char tmp; + /* Goto New Mode */ t_outb(0x0B, 0x3C4); t_inb(0x3C5); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are acpi-enable-c3-power-state-on-dell-inspiron-8200.patch git-alsa-fix-git-conflicts.patch git-audit-printk-warning-fix.patch git-cifs.patch git-drm.patch git-dvb.patch git-hwmon.patch drivers-input-touchscreen-ads7846c-fix-uninitialized-var-warning.patch git-kvm.patch git-md-accel.patch git-ubi.patch 3c509-convert-to-isa_driver-and-pnp_driver-v4-cleanup.patch update-smc91x-driver-with-arm-versatile-board-info.patch git-nfsd.patch git-sched.patch tracing-is-borked-on-powerpc.patch scsi-aic94xx-cleanups.patch git-block-git-rejects.patch git-unionfs.patch drivers-usb-storage-sddr55c-fix-uninitialized-var-warnings.patch git-x86.patch git-x86-fixup.patch git-x86-fix-rejects.patch documentation-atomic_add_unless-doesnt-imply-mb-on-failure-fix.patch tridentfb-resource-management-fixes-in-probe-function-fix.patch remove-sparse-warning-for-mmzoneh-checkpatch-fixes.patch fix-invalidate_inode_pages2_range-to-not-clear-ret-checkpatch-fixes.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch make-dev-kmem-a-config-option-fix.patch misc-phantom-add-compat-ioctl-checkpatch-fixes.patch r-o-bind-mounts-elevate-write-count-for-callers-of-vfs_mkdir-fix.patch r-o-bind-mounts-elevate-write-count-for-xattr_permission-callers-fix.patch r-o-bind-mounts-get-write-access-for-vfs_rename-callers-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix-2.patch r-o-bind-mounts-get-callers-of-vfs_mknod-create-fix.patch add-rcu_assign_index-if-ever-needed-fix.patch oprofile-change-cpu_buffer-from-array-to-per_cpu-variable-checkpatch-fixes.patch vt-notifier-extension-for-accessibility-checkpatch-fixes.patch rtc-add-support-for-the-s-35390a-rtc-chip-checkpatch-fixes.patch rtc-isl1208-new-style-conversion-and-minor-bug-fixes-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes-fix.patch rtc-x1205-new-style-conversion-checkpatch-fixes.patch fb-add-support-for-foreign-endianness-force-it-on.patch workqueues-shrink-cpu_populated_map-when-cpu-dies-fix.patch ipc-use-ipc_buildid-directly-from-ipc_addid-cleanup.patch ipmi-run-to-completion-fixes-checkpatch-fixes.patch ipmi-style-fixes-in-the-system-interface-code-checkpatch-fixes.patch elf-fix-shadowed-variables-in-fs-binfmt_elfc.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix-2.patch procfs-task-exe-symlink-fix.patch reiser4.patch jens-broke-reiser4patch-added-to-mm-tree.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch profile-likely-unlikely-macros-fix.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch w1-build-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html