diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:33:41 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:33:46 -0500 |
| commit | abf45ce84c4e36bd64aef20d7df9a79bd5e4b799 (patch) | |
| tree | f118e135bdd60b680703d1b38c7fdc7b9d7c503d /scripts/mod/file2alias.c | |
| parent | 082f53c2f573c75a8f1610c587a43b6817e20f90 (diff) | |
| parent | b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b (diff) | |
Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
* 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6: (2 commits)
ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
ARM: imx: update imx_v6_v7_defconfig
(upadte to v3.3-rc5)
Diffstat (limited to 'scripts/mod/file2alias.c')
| -rw-r--r-- | scripts/mod/file2alias.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index e8c969577768..d0de2a2c3a2d 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
| @@ -932,7 +932,7 @@ static int do_isapnp_entry(const char *filename, | |||
| 932 | (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f); | 932 | (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f); |
| 933 | return 1; | 933 | return 1; |
| 934 | } | 934 | } |
| 935 | ADD_TO_DEVTABLE("isa", struct isapnp_device_id, do_isapnp_entry); | 935 | ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry); |
| 936 | 936 | ||
| 937 | /* | 937 | /* |
| 938 | * Append a match expression for a single masked hex digit. | 938 | * Append a match expression for a single masked hex digit. |