From 892ab92954264b9fb64713b1277bf11a9c8b67c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Fri, 12 Oct 2012 14:54:17 +0200 Subject: [PATCH] Enable bridge module --- .../debian/patches/rx51_defconfig.diff | 64 +++++++++++--------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff b/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff index 80569b9..6792fe3 100644 --- a/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff +++ b/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff @@ -1,5 +1,5 @@ ---- kernel-power/arch/arm/configs/rx51_defconfig.orig 2012-09-12 13:07:32.411477937 +0200 -+++ kernel-power/arch/arm/configs/rx51_defconfig 2012-09-12 13:15:10.371462598 +0200 +--- kernel-power/arch/arm/configs/rx51_defconfig 2012-10-12 14:42:57.843316216 +0200 ++++ kernel-power/arch/arm/configs/rx51_defconfig 2012-10-12 14:51:24.339301407 +0200 @@ -36,17 +36,21 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -282,7 +282,7 @@ # CONFIG_IP_NF_QUEUE is not set CONFIG_IP_NF_IPTABLES=m # CONFIG_IP_NF_MATCH_ADDRTYPE is not set -@@ -477,16 +536,54 @@ +@@ -477,21 +536,59 @@ # CONFIG_IP_NF_MATCH_ECN is not set # CONFIG_IP_NF_MATCH_TTL is not set CONFIG_IP_NF_FILTER=m @@ -340,6 +340,12 @@ # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set + # CONFIG_ATM is not set +-# CONFIG_BRIDGE is not set ++CONFIG_BRIDGE=m + # CONFIG_NET_DSA is not set + # CONFIG_VLAN_8021Q is not set + # CONFIG_DECNET is not set @@ -503,7 +600,52 @@ # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -571,7 +577,7 @@ CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_AD7414 is not set -@@ -1218,8 +1422,31 @@ +@@ -1218,8 +1423,31 @@ CONFIG_VIDEO_SMIAREGS=m # CONFIG_SOC_CAMERA is not set CONFIG_V4L_USB_DRIVERS=y @@ -605,7 +611,7 @@ # CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set # CONFIG_VIDEO_USBVISION is not set -@@ -1250,9 +1477,10 @@ +@@ -1250,9 +1478,10 @@ # Graphics support # CONFIG_PVR=m @@ -619,7 +625,7 @@ # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y -@@ -1324,7 +1552,12 @@ +@@ -1324,7 +1553,12 @@ # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y @@ -633,7 +639,7 @@ # CONFIG_LOGO is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set -@@ -1347,7 +1580,12 @@ +@@ -1347,7 +1581,12 @@ # CONFIG_SND_MPU401 is not set CONFIG_SND_ARM=y CONFIG_SND_SPI=y @@ -647,7 +653,7 @@ CONFIG_SND_SOC=y CONFIG_SND_OMAP_SOC=y CONFIG_SND_OMAP_SOC_MCBSP=y -@@ -1402,8 +1640,8 @@ +@@ -1402,8 +1641,8 @@ CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=y @@ -658,7 +664,7 @@ # # Miscellaneous USB options -@@ -1413,8 +1651,8 @@ +@@ -1413,8 +1652,8 @@ CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y CONFIG_USB_OTG=y @@ -669,7 +675,7 @@ CONFIG_USB_MON=y # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set -@@ -1449,10 +1687,10 @@ +@@ -1449,10 +1688,10 @@ # # USB Device Class drivers # @@ -684,7 +690,7 @@ # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; -@@ -1486,7 +1724,49 @@ +@@ -1486,7 +1725,49 @@ # # USB port drivers # @@ -735,7 +741,7 @@ # # USB Miscellaneous drivers -@@ -1534,14 +1814,15 @@ +@@ -1534,14 +1815,15 @@ # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m @@ -755,7 +761,7 @@ # CONFIG_USB_CDC_COMPOSITE is not set CONFIG_USB_G_NOKIA=m CONFIG_USB_G_SOFTUPD=m -@@ -1550,9 +1831,12 @@ +@@ -1550,9 +1832,12 @@ # OTG and related infrastructure # CONFIG_USB_OTG_UTILS=y @@ -769,7 +775,7 @@ CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y -@@ -1595,6 +1879,7 @@ +@@ -1595,6 +1880,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set @@ -777,7 +783,7 @@ CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=m -@@ -1680,14 +1965,28 @@ +@@ -1680,14 +1966,28 @@ # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=m # CONFIG_EXT3_FS_XATTR is not set @@ -809,7 +815,7 @@ # CONFIG_OCFS2_FS is not set CONFIG_DNOTIFY=y CONFIG_INOTIFY=y -@@ -1699,14 +1998,17 @@ +@@ -1699,14 +1999,17 @@ CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y # CONFIG_AUTOFS_FS is not set @@ -830,7 +836,7 @@ # # DOS/FAT/NT Filesystems -@@ -1716,7 +2018,9 @@ +@@ -1716,7 +2019,9 @@ CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" @@ -841,7 +847,7 @@ # # Pseudo filesystems -@@ -1731,12 +2035,19 @@ +@@ -1731,12 +2036,19 @@ # CONFIG_CONFIGFS_FS is not set # @@ -862,7 +868,7 @@ # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -@@ -1748,6 +2059,9 @@ +@@ -1748,6 +2060,9 @@ CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBIFS_FS_DEBUG is not set CONFIG_CRAMFS=y @@ -872,7 +878,7 @@ # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set -@@ -1771,7 +2085,12 @@ +@@ -1771,7 +2086,12 @@ CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set @@ -886,7 +892,7 @@ # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -@@ -1795,14 +2114,14 @@ +@@ -1795,14 +2115,14 @@ # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set @@ -903,7 +909,7 @@ # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set -@@ -1833,10 +2152,10 @@ +@@ -1833,10 +2153,10 @@ # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set @@ -916,7 +922,7 @@ # CONFIG_DLM is not set # -@@ -1929,17 +2248,20 @@ +@@ -1929,17 +2249,20 @@ # CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y @@ -939,7 +945,7 @@ # CONFIG_CRYPTO_TEST is not set # -@@ -1947,7 +2269,7 @@ +@@ -1947,7 +2270,7 @@ # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set @@ -948,7 +954,7 @@ # # Block modes -@@ -1958,12 +2280,12 @@ +@@ -1958,12 +2281,12 @@ CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_PCBC=m @@ -963,7 +969,7 @@ # CONFIG_CRYPTO_XCBC is not set # -@@ -1977,9 +2299,9 @@ +@@ -1977,9 +2300,9 @@ # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set @@ -976,7 +982,7 @@ # CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set -@@ -1989,7 +2311,7 @@ +@@ -1989,7 +2312,7 @@ CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_ARC4=y @@ -985,7 +991,7 @@ # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set -@@ -2000,7 +2322,8 @@ +@@ -2000,7 +2323,8 @@ # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set @@ -995,7 +1001,7 @@ # # Compression -@@ -2021,7 +2344,7 @@ +@@ -2021,7 +2345,7 @@ CONFIG_CRC_CCITT=y CONFIG_CRC16=y # CONFIG_CRC_T10DIF is not set -- 1.7.9.5