wok-6.x diff linux/stuff/aufs2-kbuild.patch @ rev 13539

ajaxterm: add telnet support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Oct 27 21:59:58 2012 +0200 (2012-10-27)
parents 34e3298168a8
children
line diff
     1.1 --- a/linux/stuff/aufs2-kbuild.patch	Mon Feb 21 04:39:34 2011 +0100
     1.2 +++ b/linux/stuff/aufs2-kbuild.patch	Sat Oct 27 21:59:58 2012 +0200
     1.3 @@ -1,10 +1,10 @@
     1.4 -aufs2.1 kbuild patch for linux-2.6.37
     1.5 +aufs2.1 kbuild patch for linux-2.6.
     1.6  
     1.7  diff --git a/fs/Kconfig b/fs/Kconfig
     1.8 -index 771f457..bb1a52f 100644
     1.9 +index 19891aa..b660b64 100644
    1.10  --- a/fs/Kconfig
    1.11  +++ b/fs/Kconfig
    1.12 -@@ -191,6 +191,7 @@ source "fs/romfs/Kconfig"
    1.13 +@@ -208,6 +208,7 @@ source "fs/pstore/Kconfig"
    1.14   source "fs/sysv/Kconfig"
    1.15   source "fs/ufs/Kconfig"
    1.16   source "fs/exofs/Kconfig"
    1.17 @@ -13,19 +13,19 @@
    1.18   endif # MISC_FILESYSTEMS
    1.19   
    1.20  diff --git a/fs/Makefile b/fs/Makefile
    1.21 -index a7f7cef..95dd4d3 100644
    1.22 +index fb68c2b..c031a85 100644
    1.23  --- a/fs/Makefile
    1.24  +++ b/fs/Makefile
    1.25 -@@ -121,3 +121,4 @@ obj-$(CONFIG_BTRFS_FS)		+= btrfs/
    1.26 - obj-$(CONFIG_GFS2_FS)           += gfs2/
    1.27 +@@ -124,3 +124,4 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
    1.28   obj-$(CONFIG_EXOFS_FS)          += exofs/
    1.29   obj-$(CONFIG_CEPH_FS)		+= ceph/
    1.30 + obj-$(CONFIG_PSTORE)		+= pstore/
    1.31  +obj-$(CONFIG_AUFS_FS)           += aufs/
    1.32  diff --git a/include/linux/Kbuild b/include/linux/Kbuild
    1.33 -index 97319a8..7ebb4b4 100644
    1.34 +index 01f6362..8b3b9f1 100644
    1.35  --- a/include/linux/Kbuild
    1.36  +++ b/include/linux/Kbuild
    1.37 -@@ -60,6 +60,7 @@ header-y += atmppp.h
    1.38 +@@ -65,6 +65,7 @@ header-y += atmppp.h
    1.39   header-y += atmsap.h
    1.40   header-y += atmsvc.h
    1.41   header-y += audit.h