diff options
author | Jan Lübbe <jluebbe@debian.org> | 2009-01-12 13:47:56 +0000 |
---|---|---|
committer | Jan Lübbe <jluebbe@debian.org> | 2009-01-12 16:17:34 +0000 |
commit | 3a255aef4c2e55d743db5f95a43e8cd1d466294a (patch) | |
tree | 2f194bed6f3b47219b0b6185121b9a3bdc180eba /packages/linux/linux-openmoko-2.6.28 | |
parent | 803aba3a7e680b36b89a98d780af5d7c41628183 (diff) |
linux-openmoko-{2.6.28/devel}: remove spourious -2.6.28 files and base config on gta02-packaging-defconfig
Diffstat (limited to 'packages/linux/linux-openmoko-2.6.28')
-rw-r--r-- | packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch | 283 |
1 files changed, 12 insertions, 271 deletions
diff --git a/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch b/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch index faca44adef..109e9ec83d 100644 --- a/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch +++ b/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch @@ -1,203 +1,16 @@ ---- defconfig-oe 2009-01-09 15:38:56.000000000 +0000 -+++ defconfig-oe 2009-01-09 16:37:51.000000000 +0000 -@@ -505,8 +505,8 @@ +--- gta02-packaging-defconfig 2009-01-12 13:09:33.000000000 +0000 ++++ defconfig-oe 2009-01-12 13:18:23.000000000 +0000 +@@ -337,9 +337,6 @@ # - # IP: Netfilter Configuration + # At least one emulation must be selected # --CONFIG_NF_DEFRAG_IPV4=y --CONFIG_NF_CONNTRACK_IPV4=y -+CONFIG_NF_DEFRAG_IPV4=m -+CONFIG_NF_CONNTRACK_IPV4=m - # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set - # CONFIG_IP_NF_QUEUE is not set - CONFIG_IP_NF_IPTABLES=m -@@ -584,12 +584,12 @@ - # CONFIG_IP_SCTP is not set - # CONFIG_TIPC is not set - # CONFIG_ATM is not set --CONFIG_STP=y --CONFIG_BRIDGE=y -+CONFIG_STP=m -+CONFIG_BRIDGE=m - # CONFIG_NET_DSA is not set - # CONFIG_VLAN_8021Q is not set - # CONFIG_DECNET is not set --CONFIG_LLC=y -+CONFIG_LLC=m - # CONFIG_LLC2 is not set - # CONFIG_IPX is not set - # CONFIG_ATALK is not set -@@ -642,20 +642,20 @@ - # CONFIG_HAMRADIO is not set - # CONFIG_CAN is not set - # CONFIG_IRDA is not set --CONFIG_BT=y --CONFIG_BT_L2CAP=y --CONFIG_BT_SCO=y --CONFIG_BT_RFCOMM=y -+CONFIG_BT=m -+CONFIG_BT_L2CAP=m -+CONFIG_BT_SCO=m -+CONFIG_BT_RFCOMM=m - CONFIG_BT_RFCOMM_TTY=y --CONFIG_BT_BNEP=y -+CONFIG_BT_BNEP=m - CONFIG_BT_BNEP_MC_FILTER=y - CONFIG_BT_BNEP_PROTO_FILTER=y --CONFIG_BT_HIDP=y -+CONFIG_BT_HIDP=m +-CONFIG_FPE_NWFPE=y +-# CONFIG_FPE_NWFPE_XP is not set +-# CONFIG_FPE_FASTFPE is not set # - # Bluetooth device drivers - # --CONFIG_BT_HCIBTUSB=y -+CONFIG_BT_HCIBTUSB=m - # CONFIG_BT_HCIBTSDIO is not set - # CONFIG_BT_HCIUART is not set - # CONFIG_BT_HCIBCM203X is not set -@@ -867,24 +867,10 @@ - # CONFIG_BONDING is not set - # CONFIG_MACVLAN is not set - # CONFIG_EQUALIZER is not set --CONFIG_TUN=y -+CONFIG_TUN=m - # CONFIG_VETH is not set --# CONFIG_PHYLIB is not set --CONFIG_NET_ETHERNET=y -+# CONFIG_NET_ETHERNET is not set - CONFIG_MII=y --# CONFIG_AX88796 is not set --# CONFIG_SMC91X is not set --# CONFIG_DM9000 is not set --# CONFIG_ENC28J60 is not set --# CONFIG_SMC911X is not set --# CONFIG_IBM_NEW_EMAC_ZMII is not set --# CONFIG_IBM_NEW_EMAC_RGMII is not set --# CONFIG_IBM_NEW_EMAC_TAH is not set --# CONFIG_IBM_NEW_EMAC_EMAC4 is not set --# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set --# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set --# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set --# CONFIG_B44 is not set - # CONFIG_NETDEV_1000 is not set - # CONFIG_NETDEV_10000 is not set - -@@ -922,18 +908,18 @@ - CONFIG_USB_NET_ZAURUS=m - # CONFIG_USB_HSO is not set - # CONFIG_WAN is not set --CONFIG_PPP=y -+CONFIG_PPP=m - CONFIG_PPP_MULTILINK=y - CONFIG_PPP_FILTER=y --CONFIG_PPP_ASYNC=y --CONFIG_PPP_SYNC_TTY=y --CONFIG_PPP_DEFLATE=y --CONFIG_PPP_BSDCOMP=y --CONFIG_PPP_MPPE=y -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_MPPE=m - # CONFIG_PPPOE is not set - # CONFIG_PPPOL2TP is not set - # CONFIG_SLIP is not set --CONFIG_SLHC=y -+CONFIG_SLHC=m - # CONFIG_NETCONSOLE is not set - # CONFIG_NETPOLL is not set - # CONFIG_NET_POLL_CONTROLLER is not set -@@ -1347,17 +1333,17 @@ - # CONFIG_FONT_SUN12x22 is not set - # CONFIG_FONT_10x18 is not set - # CONFIG_LOGO is not set --CONFIG_SOUND=y -+CONFIG_SOUND=m - CONFIG_SOUND_OSS_CORE=y --CONFIG_SND=y --CONFIG_SND_TIMER=y --CONFIG_SND_PCM=y -+CONFIG_SND=m -+CONFIG_SND_TIMER=m -+CONFIG_SND_PCM=m - CONFIG_SND_HWDEP=m - CONFIG_SND_RAWMIDI=m - # CONFIG_SND_SEQUENCER is not set - CONFIG_SND_OSSEMUL=y --CONFIG_SND_MIXER_OSS=y --CONFIG_SND_PCM_OSS=y -+CONFIG_SND_MIXER_OSS=m -+CONFIG_SND_PCM_OSS=m - CONFIG_SND_PCM_OSS_PLUGINS=y - # CONFIG_SND_DYNAMIC_MINORS is not set - CONFIG_SND_SUPPORT_OLD_API=y -@@ -1376,13 +1362,13 @@ - CONFIG_SND_USB=y - CONFIG_SND_USB_AUDIO=m - # CONFIG_SND_USB_CAIAQ is not set --CONFIG_SND_SOC=y --CONFIG_SND_S3C24XX_SOC=y --CONFIG_SND_S3C24XX_SOC_I2S=y --CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y -+CONFIG_SND_SOC=m -+CONFIG_SND_S3C24XX_SOC=m -+CONFIG_SND_S3C24XX_SOC_I2S=m -+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m - # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set - # CONFIG_SND_SOC_ALL_CODECS is not set --CONFIG_SND_SOC_WM8753=y -+CONFIG_SND_SOC_WM8753=m - # CONFIG_SOUND_PRIME is not set - CONFIG_HID_SUPPORT=y - CONFIG_HID=y -@@ -1462,7 +1448,7 @@ - # - # USB Device Class drivers - # --CONFIG_USB_ACM=y -+CONFIG_USB_ACM=m - CONFIG_USB_PRINTER=m - # CONFIG_USB_WDM is not set - CONFIG_USB_TMC=m -@@ -1474,7 +1460,7 @@ - # - # may also be needed; see USB_STORAGE Help for more information - # --CONFIG_USB_STORAGE=y -+CONFIG_USB_STORAGE=m - # CONFIG_USB_STORAGE_DEBUG is not set - CONFIG_USB_STORAGE_DATAFAB=y - CONFIG_USB_STORAGE_FREECOM=y -@@ -1499,8 +1485,7 @@ - # - # USB port drivers - # --CONFIG_USB_SERIAL=y --CONFIG_USB_SERIAL_CONSOLE=y -+CONFIG_USB_SERIAL=m - CONFIG_USB_EZUSB=y - CONFIG_USB_SERIAL_GENERIC=y - CONFIG_USB_SERIAL_AIRCABLE=m -@@ -1541,7 +1526,7 @@ - CONFIG_USB_SERIAL_TI=m - CONFIG_USB_SERIAL_CYBERJACK=m - CONFIG_USB_SERIAL_XIRCOM=m --CONFIG_USB_SERIAL_OPTION=y -+CONFIG_USB_SERIAL_OPTION=m - CONFIG_USB_SERIAL_OMNINET=m - # CONFIG_USB_SERIAL_DEBUG is not set - -@@ -1601,7 +1586,7 @@ - # CONFIG_USB_MIDI_GADGET is not set - # CONFIG_USB_G_PRINTER is not set - # CONFIG_USB_CDC_COMPOSITE is not set --CONFIG_AR6000_WLAN=y -+CONFIG_AR6000_WLAN=m - CONFIG_MMC=y - # CONFIG_MMC_DEBUG is not set - CONFIG_MMC_UNSAFE_RESUME=y -@@ -1641,9 +1626,10 @@ + # Userspace binary formats +@@ -1634,9 +1631,10 @@ # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y @@ -209,88 +22,16 @@ CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y -@@ -1738,21 +1724,21 @@ - # - # File systems - # --CONFIG_EXT2_FS=y -+CONFIG_EXT2_FS=m - # CONFIG_EXT2_FS_XATTR is not set - # CONFIG_EXT2_FS_XIP is not set --CONFIG_EXT3_FS=y -+CONFIG_EXT3_FS=m - # CONFIG_EXT3_FS_XATTR is not set --CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS=m - CONFIG_EXT4DEV_COMPAT=y - CONFIG_EXT4_FS_XATTR=y - # CONFIG_EXT4_FS_POSIX_ACL is not set - CONFIG_EXT4_FS_SECURITY=y --CONFIG_JBD=y -+CONFIG_JBD=m - # CONFIG_JBD_DEBUG is not set --CONFIG_JBD2=y -+CONFIG_JBD2=m - # CONFIG_JBD2_DEBUG is not set --CONFIG_FS_MBCACHE=y -+CONFIG_FS_MBCACHE=m - # CONFIG_REISERFS_FS is not set - # CONFIG_JFS_FS is not set - CONFIG_FS_POSIX_ACL=y -@@ -1778,9 +1764,9 @@ - # - # DOS/FAT/NT Filesystems - # --CONFIG_FAT_FS=y --CONFIG_MSDOS_FS=y --CONFIG_VFAT_FS=y -+CONFIG_FAT_FS=m -+CONFIG_MSDOS_FS=m -+CONFIG_VFAT_FS=m - CONFIG_FAT_DEFAULT_CODEPAGE=437 - CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" - # CONFIG_NTFS_FS is not set -@@ -1828,15 +1814,19 @@ +@@ -1822,7 +1820,11 @@ # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set --CONFIG_NFSD=y -+CONFIG_NFS_FS=y ++CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y -+CONFIG_NFSD=m + CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y - CONFIG_NFSD_V3_ACL=y - # CONFIG_NFSD_V4 is not set - CONFIG_LOCKD=y - CONFIG_LOCKD_V4=y --CONFIG_EXPORTFS=y -+CONFIG_EXPORTFS=m - CONFIG_NFS_ACL_SUPPORT=y - CONFIG_NFS_COMMON=y - CONFIG_SUNRPC=y -@@ -1875,9 +1865,9 @@ - # CONFIG_KARMA_PARTITION is not set - # CONFIG_EFI_PARTITION is not set - # CONFIG_SYSV68_PARTITION is not set --CONFIG_NLS=y -+CONFIG_NLS=m - CONFIG_NLS_DEFAULT="iso8859-1" --CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_CODEPAGE_437=m - # CONFIG_NLS_CODEPAGE_737 is not set - # CONFIG_NLS_CODEPAGE_775 is not set - CONFIG_NLS_CODEPAGE_850=m -@@ -1901,7 +1891,7 @@ - # CONFIG_NLS_CODEPAGE_1250 is not set - # CONFIG_NLS_CODEPAGE_1251 is not set - # CONFIG_NLS_ASCII is not set --CONFIG_NLS_ISO8859_1=y -+CONFIG_NLS_ISO8859_1=m - # CONFIG_NLS_ISO8859_2 is not set - # CONFIG_NLS_ISO8859_3 is not set - # CONFIG_NLS_ISO8859_4 is not set |