The patch titled M68KNOMMU: remove unused config symbol CONFIG_DISKtel has been removed from the -mm tree. Its filename was m68knommu-remove-unused-config-symbol-config_disktel.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: M68KNOMMU: remove unused config symbol CONFIG_DISKtel From: Greg Ungerer <gerg@xxxxxxxxxxxx> Remove unused config symbol CONFIG_DISKtel. Pointed out by Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>. Signed-off-by: Greg Ungerer <gerg@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-m68knommu/system.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN include/asm-m68knommu/system.h~m68knommu-remove-unused-config-symbol-config_disktel include/asm-m68knommu/system.h --- a/include/asm-m68knommu/system.h~m68knommu-remove-unused-config-symbol-config_disktel +++ a/include/asm-m68knommu/system.h @@ -253,8 +253,7 @@ cmpxchg(volatile int *p, int old, int ne "); \ }) #elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ - defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \ - defined(CONFIG_CLEOPATRA) + defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) #define HARD_RESET_NOW() ({ \ asm(" \ movew #0x2700, %sr; \ _ Patches currently in -mm which might be from gerg@xxxxxxxxxxxx are origin.patch printk-add-interfaces-for-external-access-to-the-log-buffer.patch printk-add-interfaces-for-external-access-to-the-log-buffer-fix.patch printk-add-interfaces-for-external-access-to-the-log-buffer-fix-2.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