summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-05 21:45:59 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-03-05 21:45:59 +0000
commit1e806ea982facbc58378aa2d36e0c6f7d8937472 (patch)
treea02ec321373ecbc87f07b26efd11cbdd07aad2d6
parent61183eaabcc15bb0e73cae422a68246453a2aa3c (diff)
[kernel] Some symbols were missing or wrong. Tested with x86.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14751 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/i2c.mk4
-rw-r--r--package/kernel/modules/other.mk2
-rw-r--r--target/linux/generic-2.6/config-2.6.287
3 files changed, 11 insertions, 2 deletions
diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index 55a2605f4..2b7661d7a 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -97,7 +97,9 @@ define KernelPackage/i2c-scx200
SUBMENU:=$(I2C_MENU)
TITLE:=Geode SCx200 I2C using GPIO pins
DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-algo-bit
- KCONFIG:=CONFIG_SCx200_I2C
+ KCONFIG:=CONFIG_SCx200_I2C \
+ CONFIG_SCx200_I2C_SCL=12 \
+ CONFIG_SCx200_I2C_SDA=13
FILES:=$(LINUX_DIR)/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,59,scx200_i2c)
endef
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index fb0eb9c67..87e92b951 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -546,7 +546,7 @@ define KernelPackage/scx200-wdt
SUBMENU:=$(OTHER_MENU)
TITLE:=Natsemi SCX200 Watchdog support
DEPENDS:=@TARGET_x86
- KCONFIG:=CONFIG_SC1200_WDT
+ KCONFIG:=CONFIG_SCx200_WDT
FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
endef
diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index 659852592..c5e2a1926 100644
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -353,6 +353,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# CONFIG_DL2K is not set
# CONFIG_DLM is not set
# CONFIG_DMADEVICES is not set
+# CONFIG_DMASCC is not set
# CONFIG_DMA_ENGINE is not set
# CONFIG_DNOTIFY is not set
# CONFIG_DRM is not set
@@ -846,6 +847,8 @@ CONFIG_LOCALVERSION=""
# CONFIG_LOCKD is not set
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_LOCKD_V4=y
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LSF is not set
# CONFIG_LXT_PHY is not set
@@ -1178,6 +1181,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_P54_COMMON is not set
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
+# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
@@ -1374,6 +1378,7 @@ CONFIG_RT_MUTEXES=y
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
# CONFIG_SC92031 is not set
+# CONFIG_SCC is not set
# CONFIG_SCHED_TRACER is not set
# CONFIG_SCSI is not set
# CONFIG_SCSI_3W_9XXX is not set
@@ -1622,6 +1627,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_INTERWAVE is not set
# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_ISA is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_LAYLA24 is not set
@@ -1670,6 +1676,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_USB=y
# CONFIG_SND_USB_AUDIO is not set
# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_US122L is not set
# CONFIG_SND_USB_USX2Y is not set
# CONFIG_SND_VERBOSE_PRINTK is not set
CONFIG_SND_VERBOSE_PROCFS=y