The patch titled
drivers/w1/w1.c: fix a compile error
has been removed from the -mm tree. Its filename is
gregkh-i2c-w1-cleanups-fix.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Adrian Bunk <bunk@xxxxxxxxx>
drivers/w1/w1.c:197: error: static declaration of 'w1_bus_type' follows non-static declaration
drivers/w1/w1.h:217: error: previous declaration of 'w1_bus_type' was here
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/w1/w1.h | 1 -
1 files changed, 1 deletion(-)
diff -puN drivers/w1/w1.h~gregkh-i2c-w1-cleanups-fix drivers/w1/w1.h
--- devel/drivers/w1/w1.h~gregkh-i2c-w1-cleanups-fix 2006-04-09 21:43:43.000000000 -0700
+++ devel-akpm/drivers/w1/w1.h 2006-04-09 21:43:43.000000000 -0700
@@ -214,7 +214,6 @@ static inline struct w1_master* dev_to_w
}
extern struct device_driver w1_master_driver;
-extern struct bus_type w1_bus_type;
extern struct device w1_master_device;
extern int w1_max_slave_count;
extern int w1_max_slave_ttl;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
fix-array-overrun-in-drivers-char-mwave-mwaveddc.patch
readd-the-oss-sound_cs4232-option.patch
mark-vmsplit-embedded.patch
git-acpi.patch
acpiphp-use-new-dock-driver-fix.patch
git-alsa.patch
git-dvb.patch
fix-video_dev=m-video_v4l1_compat=y.patch
drivers-media-video-vivic-possible-cleanups.patch
avermedia-6-eyes-avs6eyes-support.patch
git-gfs2.patch
git-infiniband.patch
git-intelfb.patch
fs-nfs-inodec-make-nfs_follow_referral.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
git-scsi-rc-fixes.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
ieee80211_wxc-remove-dead-code.patch
swsusp-rework-memory-shrinker-rev-2-fix.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
kernel-power-snapshotc-cleanups.patch
remove-fs-jffs2-ioctlc.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
time-i386-clocksource-drivers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
x86_64-unexport-ia32_sys_call_table.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
